terraspace_plugin_google 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1969fbb36af32fab94f9351578d4807c893066757463883a59782c431a5a56f
-  data.tar.gz: d1cdf9f00fc64526cf1e935d74b201eb24a71bd1204f0a1a0e6b3c7cef05257d
+  metadata.gz: 0a0b80fe04a11716e39db70f0b64264f2eccecd150a4095307c0d108ef1b6f2b
+  data.tar.gz: b04f6e945ece9bf18bcd4956844d47675e460f23c35c52132813e43195da4fbf
 SHA512:
-  metadata.gz: 18e36296b55e061e6a093b2726006a4b860f0815630d5401a95ced5b5054825db13b014638795df4963c8ae797b81d8933f1958b71296883967279c43e1a39ab
-  data.tar.gz: 5e04f12177cd156b327ff86fbb7b0df7887043616b96d544c8412e2a44f66c2de6fe45e80f8603a758eaaebaef733315e3d357ae6c2d966cca3e6db41f93ef37
+  metadata.gz: a94bac4d8de2cfc1b661368bed8edb2f90ebb3f8ccf7f285018535112d8d0da3d06a43d75af73bbd8c3840e6e583b9708a94fd0ddd157c1873e7e206d627e989
+  data.tar.gz: fa4e9afe18caae22b987a84b87626a46529fd27eb12e64b3d4cebc269efa10090c7e14a45f6a640292d1320aac1fc9217ef4a8759b2bbd345e5648b7d11006ef

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.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
 

data/lib/terraspace_plugin_google/interfaces/helper/secret.rb

@@ -4,9 +4,10 @@ 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.")
     end
@@ -18,6 +19,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 +27,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 +40,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.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_plugin_google
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-01-04 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