terraspace_plugin_google 0.3.1 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628fdc35ca018bb08c245ade973b52cb1791ae4cae8858dac9cc787312c81be6
-  data.tar.gz: 73c858a9d4452668896b68c58aa51f0b23f6dcbb5d2f07cce9c3df1b4273cebb
+  metadata.gz: 8d49aa4dec651de8b67872942c9f237b38e123263985f6d6d18151b46ffe14b5
+  data.tar.gz: '04508bd3f5f2336e0d2bf3cb99943809961e0d5807eef3afbdbf311e769540ee'
 SHA512:
-  metadata.gz: a157213a221b74251896316d3bd879496e25a68dced1d44a294958e51c0ba3e830959fe07cd869f115cd73ea220660a20128484349c3328eadd87bbd2ca2ed5e
-  data.tar.gz: 24297c26f98c24ad85f689fc82c1e14acf64583e909da9b566524bd263b0e48cdb8fd6281753702dbc5595f010fddb47578f8432530e91af78ec30fa1324a1c7
+  metadata.gz: 5fb9e68077f452fdbb96d00ebdcaac6b67bed251752c4c388be97cfb9e48568f48d73b4a02ee7d1293e3872bbbbc7d4e400bbfa2135c88a5b54f3b9a90eb6c99
+  data.tar.gz: da5a5b2f44d20182d9ea0916f144f8b0703b2f4d774bbc9658af8078ccf802cd0251eaf4f7515b46c4f3974af1eb4b297135ff5b671171769996e36e1d52ca3b

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 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.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
+
+## [0.3.2] - 2021-11-25
+- [#8](https://github.com/boltops-tools/terraspace_provider_google/pull/8) update example templates to include bucket location which is now required
+
 ## [0.3.1] - 2021-11-13
 - [#7](https://github.com/boltops-tools/terraspace_provider_google/pull/7) get google project number via api
 

data/lib/templates/hcl/module/main.tf

@@ -1,4 +1,5 @@
 resource "google_storage_bucket" "this" {
   name                        = var.name
   uniform_bucket_level_access = var.uniform_bucket_level_access
+  location                    = var.location
 }

data/lib/templates/hcl/module/variables.tf

@@ -8,3 +8,9 @@ variable "uniform_bucket_level_access" {
   type        = bool
   default     = false
 }
+
+variable "location" {
+  description = "location"
+  type        = string
+  default     = "US"
+}

data/lib/templates/hcl/stack/main.tf

@@ -7,4 +7,5 @@ module "bucket" {
 
   name                        = "bucket-${random_pet.this.id}"
   uniform_bucket_level_access = var.uniform_bucket_level_access
+  location                    = var.location
 }

data/lib/templates/hcl/stack/variables.tf

@@ -3,3 +3,9 @@ variable "uniform_bucket_level_access" {
   type        = bool
   default     = false
 }
+
+variable "location" {
+  description = "location"
+  type        = string
+  default     = "US"
+}

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/helper/secret.rb

@@ -4,11 +4,19 @@ module TerraspacePluginGoogle::Interfaces::Helper
   class Secret
     include TerraspacePluginGoogle::Clients
     include TerraspacePluginGoogle::Logging
+    extend Memoist
 
-    def initialize(options={})
-      @options = options
+    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")
@@ -18,6 +26,7 @@ module TerraspacePluginGoogle::Interfaces::Helper
     end
 
     def fetch_value(short_name, version="latest")
+      short_name = expansion(short_name) if expand?
       name = "projects/#{project_number}/secrets/#{short_name}/versions/#{version}"
       version = secret_manager_service.access_secret_version(name: name)
       version.payload.data
@@ -25,6 +34,10 @@ module TerraspacePluginGoogle::Interfaces::Helper
       logger.info "WARN: secret #{name} not found".color(:yellow)
       logger.info e.message
       "NOT FOUND #{name}" # simple string so Kubernetes YAML is valid
+    rescue Google::Cloud::InvalidArgumentError => e
+      logger.info "WARN: secret #{name} not found".color(:yellow)
+      logger.info e.message
+      "NOT FOUND #{name}" # simple string so Kubernetes YAML is valid
     end
 
   private
@@ -34,5 +47,15 @@ module TerraspacePluginGoogle::Interfaces::Helper
       project = resource_manager.project(@project_id)
       @@project_number = project.project_number
     end
+
+    delegate :expansion, to: :expander
+    def expander
+      TerraspacePluginGoogle::Interfaces::Expander.new(@mod)
+    end
+    memoize :expander
+
+    def expand?
+      !(@options[:expansion] == false || @options[:expand] == false)
+    end
   end
 end

data/lib/terraspace_plugin_google/interfaces/helper.rb

@@ -3,7 +3,7 @@ module TerraspacePluginGoogle::Interfaces
     include Terraspace::Plugin::Helper::Interface
 
     def google_secret(name, options={})
-      Secret.new(options).fetch(name)
+      Secret.new(@mod, options).fetch(name)
     end
     cache_helper :google_secret
   end

data/lib/terraspace_plugin_google/version.rb

@@ -1,3 +1,3 @@
 module TerraspacePluginGoogle
-  VERSION = "0.3.1"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_plugin_google
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gcp_data
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Terraspace Google Cloud Plugin