terraspace_plugin_google 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f70f3d2b05883b51424fcf33c4054ec87245a6194907501ece79d203d4004752
-  data.tar.gz: d98024a5205b2385d16761193ea367d302ba1cc2c57fef710f647cd3d49d2e54
+  metadata.gz: e7dba80e79b96d707667d07cbbf61fbe4bbd4976908f504887efd49b1419a264
+  data.tar.gz: b0949e7e0e73e1413155ab3fa8caf97ccdbfb402c2d10b497d0b6d2e20d3fa06
 SHA512:
-  metadata.gz: 11ec0a19248922068b38c68990477de03c8fcdd1c6bdc7eb9b8b583deb35a0a46a0f36c0319d7feb2fcf2913536b1e468d5c57c985c92cdfca7aba5379b6e16a
-  data.tar.gz: 30ea996f68cdd59da9902fd57dec0b89a643e272c5c04c7d9db407a9439aa5ef0c4ef89ae577ac0b9163b3aedb04df0d35debf3a7b43f4be63c719a69f09ede8
+  metadata.gz: 3cd25c6f8d6308426da2d69481986f28e619a8e80a82e929f86011e992d87d84145b7c2023cb28a6c2848d93ab7a00be0fa1f933611880e2f261666447e40394
+  data.tar.gz: aa4872cea2c160e93577afa8345c3b547d5ceff12fc7b303f72bb24f8aef7da50c5c656e410bdfe81ea5ebb0e7d53a63f4ccf51100a3b77f0432a075c91534e8

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.4.1] - 2022-06-14
+- [#14](https://github.com/boltops-tools/terraspace_provider_google/pull/14) backend.tf template project variable
+
+## [0.4.0] - 2022-06-10
+- [#13](https://github.com/boltops-tools/terraspace_provider_google/pull/13) update generated backend key and ci interface
+
+## [0.3.5] - 2022-01-11
+- [#11](https://github.com/boltops-tools/terraspace_provider_google/pull/11) set GOOGLE_CLOUD_PROJECT while keeping backwards compatibility
+
 ## [0.3.4] - 2022-01-11
 - [#10](https://github.com/boltops-tools/terraspace_provider_google/pull/10) set GOOGLE_CLOUD_PROJECT while keeping backwards compatibility
 

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

@@ -1,6 +1,6 @@
 terraform {
   backend "gcs" {
     bucket = "<%%= expansion('terraform-state-:PROJECT-:REGION-:ENV') %>"
-    prefix = "<%%= expansion(':REGION/:ENV/:BUILD_DIR') %>"
+    prefix = "<%%= expansion(':PROJECT/:TYPE_DIR/:APP/:ROLE/:MOD_NAME/:ENV/:EXTRA/:REGION') %>"
   }
 }

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

@@ -1,4 +1,4 @@
 backend("gcs",
-  bucket: "terraform-state-:PROJECT-:REGION-:ENV", # expanded by terraspace IE: terraform-state-project-us-central1-dev
-  prefix: ":REGION/:ENV/:BUILD_DIR", # expanded by terraspace IE: us-central1/dev/modules/vm
+  bucket: "terraform-state-:PROJECT-:REGION-:ENV",
+  prefix: ":PROJECT/:TYPE_DIR/:APP/:ROLE/:MOD_NAME/:ENV/:EXTRA/:REGION",
 )

data/lib/terraspace_plugin_google/clients.rb

@@ -6,6 +6,17 @@ module TerraspacePluginGoogle
   module Clients
     extend Memoist
 
+    def initialize(*)
+      # So google sdk newer versions use GOOGLE_CLOUD_PROJECT instead of GOOGLE_PROJECT
+      # Found out between google-cloud-storage-1.35.0 and google-cloud-storage-1.28.0
+      # Though it seems like an library underneath that with the change.
+      # Keeping backwards compatibility to not create breakage users who already have GOOGLE_PROJECT
+      # But then setting GOOGLE_CLOUD_PROJECT so it works with the SDK.
+      # For users, who set GOOGLE_CLOUD_PROJECT that will work also.
+      ENV['GOOGLE_CLOUD_PROJECT'] ||= ENV['GOOGLE_PROJECT']
+      super
+    end
+
     def secret_manager_service
       Google::Cloud::SecretManager.secret_manager_service
     end

data/lib/terraspace_plugin_google/interfaces/ci.rb

@@ -0,0 +1,12 @@
+module TerraspacePluginGoogle::Interfaces
+  class Ci
+    def vars
+      {
+        GOOGLE_APPLICATION_CREDENTIALS: '${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}',
+        GOOGLE_PROJECT: '${{ secrets.GOOGLE_PROJECT }}',
+        GOOGLE_REGION: '${{ secrets.GOOGLE_REGION }}',
+        GOOGLE_ZONE: '${{ secrets.GOOGLE_ZONE }}',
+      }
+    end
+  end
+end

data/lib/terraspace_plugin_google/version.rb

@@ -1,3 +1,3 @@
 module TerraspacePluginGoogle
-  VERSION = "0.3.4"
+  VERSION = "0.4.1"
 end

data/lib/terraspace_plugin_google.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_plugin_google
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gcp_data
@@ -140,6 +140,7 @@ files:
 - lib/terraspace_plugin_google/autoloader.rb
 - lib/terraspace_plugin_google/clients.rb
 - lib/terraspace_plugin_google/interfaces/backend.rb
+- lib/terraspace_plugin_google/interfaces/ci.rb
 - lib/terraspace_plugin_google/interfaces/config.rb
 - lib/terraspace_plugin_google/interfaces/expander.rb
 - lib/terraspace_plugin_google/interfaces/helper.rb
@@ -169,7 +170,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 Google Cloud Plugin