terraspace_plugin_azurerm 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec2e5dd19a2e9f8116982f180920250368a90bb19cba4ac99326a4da5af30c65
-  data.tar.gz: 1e136803c90e204fcd657ffda15cf8a95b551011ad468f791baff0b80f18ac0d
+  metadata.gz: 164c2f861c27f9b9a6427ea7a0bc710a150f8e6d2b95f71249434849aaa4f6b4
+  data.tar.gz: b1363b09aab88c7453eb1bd88cf0ea9672696e98e33a6ec2ca31fcfb4ecc99a5
 SHA512:
-  metadata.gz: 9df596602653194f78eb445ca051fe434b167c39b843b22f1ca2aef3a58e150ef8e2fc3556b3bc13a06733b15a0d82583d0913a5c413955c8301c4f1b9df0f87
-  data.tar.gz: e8b3dc7c1dcd1bebcd3528f40d5948c0e9c5d772aa915fa81c31c32279ca07857d2efaa80e265e4bde79800eb2dd9c8ee5661a98d8fb118bcf07fce7ad53b2da
+  metadata.gz: d7561f51bb0b4fa310bb7e82a500f80b02c7bbabf3929b6cb340bdc0ad8e9da265ae99d3e11f2744f16955895b60f23528d37aed2bbe4d1891d921a3ff64ecaf
+  data.tar.gz: 915f012ffa5cd6aef560a4dc5015a4b1ff105085576db06060752238e799c4fb170f33595c99ee8e39755ae135fb8695d772af5961c71dd533cb0d677a766e56

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.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
 

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(':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:                  ":TYPE_DIR/:APP/:ROLE/:MOD_NAME/:ENV/:EXTRA/:LOCATION/terraform.tfstate",
 )

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.1"
+  VERSION = "0.6.0"
 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.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-06-10 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