terraspace_plugin_azurerm 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11fda0fac205761533c2f4d73f68b4e1e8b97c98acdd81b59989dabf855f7a71
-  data.tar.gz: 92d71e9bce40c3dff7a644ee98baf1a6f1e8864f86b34ee861b30604b976f6e3
+  metadata.gz: 194532966d4108be2a98fb6a0b7a9d04f2f2c84cad28ce2217a1aa48d274ba13
+  data.tar.gz: 6e3c693f26b7c85a9e411f9839ff80935e8d1a6d5c2af5cce37c1b33f9a2ce26
 SHA512:
-  metadata.gz: d687364d16af25a282933fd7eba6107fb7d422a062b1d7b44608fb504d78de1c56668f14f4a0ec7b002bbad4c35102eaef16652a8fab03f4a34c56b26d114676
-  data.tar.gz: cd71ed24124dbc1f00665b2aa5566d3d07fbd93ca47415a405ae5b1061a471ad7d47d938bd43db5de91af57694d58450c30fa6f83c1eb110db03cb8c721f7c10
+  metadata.gz: fda538935457a2cf506ffb95e4e3bed5328325349ca57c80f7affa69ac962d46cb4ebef7f73c80190863298b198a817a902763afd1c3b4d8cfda6dfdbd9fc4b4
+  data.tar.gz: 044da95d5619fa81c624f691c620e0aaafc3962565054ce86d5202cf4d637a7111cc43dbfeb1488db3250fafe5690f5d915405cdc92bb6406ef1c5a1dcfe8178

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.6.1] - 2022-06-14
+- [#17](https://github.com/boltops-tools/terraspace_plugin_azurerm/pull/17) backend.tf template project variable
+
+## [0.6.0] - 2022-06-10
+- [#16](https://github.com/boltops-tools/terraspace_plugin_azurerm/pull/16) update generated backend key and ci interface
+
+## [0.5.1] - 2022-05-03
+- [#15](https://github.com/boltops-tools/terraspace_plugin_azurerm/pull/15) pascalCase
+
 ## [0.5.0] - 2022-01-20
 - [#14](https://github.com/boltops-tools/terraspace_plugin_azurerm/pull/14) use armrest gem
 

data/lib/templates/hcl/project/config/terraform/backend.tf

@@ -1,10 +1,11 @@
 # SUBSCRIPTION_HASH is a short 4-char consistent hash of the longer subscription id.
+# LOCATION_HASH is a short 4-char consistent hash of the longer location.
 # This is useful because azure storage account names are not allowed special characters and are limited to 24 chars.
 terraform {
   backend "azurerm" {
-    resource_group_name  = "<%= expansion(':ENV-:LOCATION') %>"
-    storage_account_name = "<%= expansion('ts:SUBSCRIPTION_HASH:LOCATION:ENV') %>"
+    resource_group_name  = "<%= expansion(':APP-:ENV-:LOCATION') %>"
+    storage_account_name = "<%= expansion('ts:APP_HASH:SUBSCRIPTION_HASH:LOCATION_HASH:ENV') %>"
     container_name       = "terraform-state"
-    key                  = "<%= expansion(':LOCATION/:ENV/:BUILD_DIR/terraform.tfstate') %>"
+    key                  = "<%= expansion(':PROJECT/:TYPE_DIR/:APP/:ROLE/:MOD_NAME/:ENV/:EXTRA/:LOCATION/terraform.tfstate') %>"
   }
 }

data/lib/templates/ruby/project/config/terraform/backend.rb

@@ -1,8 +1,9 @@
 # SUBSCRIPTION_HASH is a short 4-char consistent hash of the longer subscription id.
+# LOCATION_HASH is a short 4-char consistent hash of the longer location.
 # This is useful because azure storage account names are not allowed special characters and are limited to 24 chars.
 backend("azurerm",
-  resource_group_name:  "terraform-resources-:LOCATION",
-  storage_account_name: "ts:SUBSCRIPTION_HASH:LOCATION:ENV",
+  resource_group_name:  ":APP-:ENV-:LOCATION",
+  storage_account_name: "ts:APP_HASH:SUBSCRIPTION_HASH:LOCATION_HASH:ENV",
   container_name:       "terraform-state",
-  key:                  ":LOCATION/:ENV/:BUILD_DIR/terraform.tfstate",
+  key:                  ":PROJECT/:TYPE_DIR/:APP/:ROLE/:MOD_NAME/:ENV/:EXTRA/:LOCATION/terraform.tfstate",
 )

data/lib/terraspace_plugin_azurerm/interfaces/backend/storage_account.rb

@@ -43,7 +43,7 @@ class TerraspacePluginAzurerm::Interfaces::Backend
           tier: config.storage_account.sku.tier,
         },
         properties: {
-          allow_blob_public_access: config.storage_account.allow_blob_public_access,
+          allowBlobPublicAccess: config.storage_account.allow_blob_public_access,
         },
         kind: "StorageV2",
         tags: config.tags,
@@ -67,9 +67,9 @@ class TerraspacePluginAzurerm::Interfaces::Backend
       }
       # final props
       {
-        container_delete_retention_policy: container_delete_retention_policy,
-        delete_retention_policy: delete_retention_policy,
-        is_versioning_enabled: sa.is_versioning_enabled,
+        containerDeleteRetentionPolicy: container_delete_retention_policy,
+        deleteRetentionPolicy: delete_retention_policy,
+        isVersioningEnabled: sa.is_versioning_enabled,
       }
     end
 

data/lib/terraspace_plugin_azurerm/interfaces/ci.rb

@@ -0,0 +1,13 @@
+module TerraspacePluginAzurerm::Interfaces
+  class Ci
+    # interface method
+    def vars
+      {
+        ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}',
+        ARM_CLIENT_SECRET: '${{ secrets.ARM_CLIENT_SECRET }}',
+        ARM_TENANT_ID: '${{ secrets.ARM_TENANT_ID }}',
+        ARM_CLIENT_ID: '${{ secrets.ARM_CLIENT_ID }}',
+      }
+    end
+  end
+end

data/lib/terraspace_plugin_azurerm/interfaces/expander.rb

@@ -29,5 +29,21 @@ module TerraspacePluginAzurerm::Interfaces
       Digest::SHA1.hexdigest(subscription)[0..3]
     end
     alias_method :namespace_hash, :subscription_hash
+
+    # location_hash is a short 4-char consistent hash of the longer subscription id.
+    # This is useful because azure storage account names are not allowed special characters and are limited to 24 chars.
+    # NOTE: be careful to not change this! or else state path will change
+    def location_hash
+      Digest::SHA1.hexdigest(location)[0..3]
+    end
+    alias_method :region_hash, :location_hash
+
+    def app_hash
+      Digest::SHA1.hexdigest(ENV['TS_APP'])[0..3] if ENV['TS_APP']
+    end
+
+    def env_hash
+      Digest::SHA1.hexdigest(ENV['TS_ENV'])[0..3] if ENV['TS_ENV']
+    end
   end
 end

data/lib/terraspace_plugin_azurerm/version.rb

@@ -1,3 +1,3 @@
 module TerraspacePluginAzurerm
-  VERSION = "0.5.0"
+  VERSION = "0.6.1"
 end

data/lib/terraspace_plugin_azurerm.rb

@@ -41,5 +41,6 @@ Terraspace::Plugin.register("azurerm",
   config_class: TerraspacePluginAzurerm::Interfaces::Config,
   helper_class: TerraspacePluginAzurerm::Interfaces::Helper,
   layer_class: TerraspacePluginAzurerm::Interfaces::Layer,
+  ci_class: TerraspacePluginAzurerm::Interfaces::Ci,
   root: File.dirname(__dir__),
 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_plugin_azurerm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: armrest
@@ -118,6 +118,7 @@ files:
 - lib/terraspace_plugin_azurerm/interfaces/backend/blob_container.rb
 - lib/terraspace_plugin_azurerm/interfaces/backend/resource_group_creator.rb
 - lib/terraspace_plugin_azurerm/interfaces/backend/storage_account.rb
+- lib/terraspace_plugin_azurerm/interfaces/ci.rb
 - lib/terraspace_plugin_azurerm/interfaces/config.rb
 - lib/terraspace_plugin_azurerm/interfaces/expander.rb
 - lib/terraspace_plugin_azurerm/interfaces/helper.rb
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.12
 signing_key: 
 specification_version: 4
 summary: Terraspace Azurerm Cloud Plugin