terraspace_plugin_google 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a0b80fe04a11716e39db70f0b64264f2eccecd150a4095307c0d108ef1b6f2b
-  data.tar.gz: b04f6e945ece9bf18bcd4956844d47675e460f23c35c52132813e43195da4fbf
+  metadata.gz: 0ee01133cfd8c39db829850b3a3f4b7e7d666b19ee80a59110b812f4e1a28472
+  data.tar.gz: 79f451387710cafcd197dd0587d2cc13f2f18c8d4ce17df5fd8d78ef1662d8e4
 SHA512:
-  metadata.gz: a94bac4d8de2cfc1b661368bed8edb2f90ebb3f8ccf7f285018535112d8d0da3d06a43d75af73bbd8c3840e6e583b9708a94fd0ddd157c1873e7e206d627e989
-  data.tar.gz: fa4e9afe18caae22b987a84b87626a46529fd27eb12e64b3d4cebc269efa10090c7e14a45f6a640292d1320aac1fc9217ef4a8759b2bbd345e5648b7d11006ef
+  metadata.gz: b66536dc2fd67abac5c4a6ce63fe163848b68fc29b7f3cee5ea016375895be5a3964056c86173907be8d1444bc33f3c7762275a0558e6a00846e52b995e988d6
+  data.tar.gz: c1b96f881f96bb5ecbc4754d33bee2cf6d69682625597371ee544efa269377493470c36647db54e5c3b2f00c7db8adf0a550c23cca2cd379fe3433d4f921bf0d

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.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
+
 ## [0.3.3] - 2022-01-04
 - [#9](https://github.com/boltops-tools/terraspace_provider_google/pull/9) google_secret support expansion automatically
 

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(':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: ":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/interfaces/helper/secret.rb

@@ -9,7 +9,14 @@ module TerraspacePluginGoogle::Interfaces::Helper
     def initialize(mod, options={})
       @mod, @options = mod, options
       @base64 = options[:base64]
-      @project_id = options[:google_project] || ENV['GOOGLE_PROJECT'] || raise("GOOGLE_PROJECT env variable is not set. It's required.")
+      @project_id = options[:google_project] || ENV['GOOGLE_CLOUD_PROJECT'] || ENV['GOOGLE_PROJECT'] || raise("GOOGLE_PROJECT env variable is not set. It's required.")
+      # 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'] ||= @project_id
     end
 
     def fetch(short_name, version: "latest")

data/lib/terraspace_plugin_google/version.rb

@@ -1,3 +1,3 @@
 module TerraspacePluginGoogle
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 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.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-06-10 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