terraspace_plugin_aws 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c20f17d758fbb6924ceece1c1bbc16ec17e3eba0fa8a0a6fa4d644b9875579b6
-  data.tar.gz: 73b7f625a5f84f7252206717523807c7607ac4a4fe6f6572cfd01e7110641b38
+  metadata.gz: cdced79235a57025ab37b33dbdf98d9146caffaa4f3eac5f40b2a657a99ea3ca
+  data.tar.gz: 154369a87b3ffb7fb8290a4b3564108b976e1f7826b0f36fa737b88050e4755c
 SHA512:
-  metadata.gz: 39978c0db0055dba8dc59246b9da3dd20c469daf36805526f4b2c0c051425dd6dbf0be054812de9e7ae0c32b31657222225ae039915ddc3ef11aab657d9adbb9
-  data.tar.gz: ff11fee1dec2508d941dacd4f727ad362802285aca20ac2b0aa9cc87a034e0d287f9f10db3816e330958025e608fdeff45720b543047f1d3fe5fe52f5f305fb1
+  metadata.gz: 42ebf3fabea658ddb1876aaefa972888e2d2b958239eed92ad9ad9dd3a4d23dea83d67beefbdce28512585a3ceecdb7f904dc08ce8ce87859dcd3e354ada313e
+  data.tar.gz: 84c6a6dc52b9f645f5dab2ab1284eccca1d152034106b4a694f42294149d441aaa5bffc0e67cc37e17c5d990758396dadef0761617a3a606372ecc25954d5ea3

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.6] - 2022-01-04
+- [#17](https://github.com/boltops-tools/terraspace_plugin_aws/pull/17) aws_secret and aws_ssm: support expansion automatically
+
 ## [0.3.5] - 2021-12-30
 - [#15](https://github.com/boltops-tools/terraspace_plugin_aws/pull/15) block public access support
 - [#16](https://github.com/boltops-tools/terraspace_plugin_aws/pull/16) tagging support for s3 bucket and dynamodb table

data/README.md

@@ -1,5 +1,7 @@
 # Terraspace AWS Plugin
 
+[![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
+
 AWS Cloud support for terraspace.
 
 ## Installation
@@ -12,6 +14,8 @@ gem 'terraspace_plugin_aws'
 
 ## Configure
 
+Terraspace Docs: [AWS Terraspace Plugin](https://terraspace.cloud/docs/plugins/aws/)
+
 Optionally configure the plugin. Here's an example `aws.rb` for your terraspace project.
 
 config/plugins/aws.rb

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

@@ -1,6 +1,7 @@
 module TerraspacePluginAws::Interfaces::Helper
   class Secret < SecretBase
     def fetch(secret_id)
+      secret_id = expansion(secret_id) if expand?
       value = fetch_value(secret_id)
       value = Base64.strict_encode64(value).strip if @base64
       value
@@ -13,6 +14,10 @@ module TerraspacePluginAws::Interfaces::Helper
       logger.info "WARN: secret_id #{secret_id} not found".color(:yellow)
       logger.info e.message
       "NOT FOUND #{secret_id}" # simple string so Kubernetes YAML is valid
+    rescue Aws::SecretsManager::Errors::ValidationException => e
+      logger.info "WARN: secret_id #{secret_id} not found".color(:yellow)
+      logger.info e.message
+      "INVALID NAME #{secret_id}" # simple string so tfvars valid
     end
   end
 end

data/lib/terraspace_plugin_aws/interfaces/helper/secret_base.rb

@@ -4,10 +4,23 @@ module TerraspacePluginAws::Interfaces::Helper
   class SecretBase
     include TerraspacePluginAws::Clients
     include TerraspacePluginAws::Logging
+    extend Memoist
 
-    def initialize(options={})
+    def initialize(mod, options={})
+      @mod = mod
       @options = options
       @base64 = options[:base64]
     end
+
+  private
+    delegate :expansion, to: :expander
+    def expander
+      TerraspacePluginAws::Interfaces::Expander.new(@mod)
+    end
+    memoize :expander
+
+    def expand?
+      !(@options[:expansion] == false || @options[:expand] == false)
+    end
   end
 end

data/lib/terraspace_plugin_aws/interfaces/helper/ssm.rb

@@ -1,6 +1,10 @@
 module TerraspacePluginAws::Interfaces::Helper
   class SSM < SecretBase
+    include Terraspace::Compiler::Dsl::Syntax::Mod::Backend
+    extend Memoist
+
     def fetch(name)
+      name = expansion(name) if expand?
       value = fetch_value(name)
       value = Base64.strict_encode64(value).strip if @base64
       value
@@ -13,6 +17,10 @@ module TerraspacePluginAws::Interfaces::Helper
       logger.info "WARN: name #{name} not found".color(:yellow)
       logger.info e.message
       "NOT FOUND #{name}" # simple string so tfvars valid
+    rescue Aws::SSM::Errors::ValidationException => e
+      logger.info "WARN: name #{name} not found".color(:yellow)
+      logger.info e.message
+      "INVALID NAME #{name}" # simple string so tfvars valid
     end
   end
 end

data/lib/terraspace_plugin_aws/interfaces/helper.rb

@@ -3,12 +3,12 @@ module TerraspacePluginAws::Interfaces
     include Terraspace::Plugin::Helper::Interface
 
     def aws_secret(name, options={})
-      Secret.new(options).fetch(name)
+      Secret.new(@mod, options).fetch(name)
     end
     cache_helper :aws_secret
 
     def aws_ssm(name, options={})
-      SSM.new(options).fetch(name)
+      SSM.new(@mod, options).fetch(name)
     end
     cache_helper :aws_ssm
   end

data/lib/terraspace_plugin_aws/version.rb

@@ -1,3 +1,3 @@
 module TerraspacePluginAws
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_plugin_aws
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb