simplygenius-atmos 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1186c014f0d9ae9001d66ca5594ec089cd4aef594f231e996866668eb268bb
-  data.tar.gz: 47310dea764cc5efb7a2163383464cfb8b80ddc5b07cb73f7403ce54a093d38e
+  metadata.gz: 04d15a018baaae4374130fb1128992a038334e7f15669f2444b76b4e235d1175
+  data.tar.gz: 6ef9631e9148dbee317857276ade4be8ce832dbe4321521a03f048067cd4b8b3
 SHA512:
-  metadata.gz: ad9ffd6c76d3f8a3a0231d769b949e2c93184ee079e85d9ca8992d423058577c1d5957444759daf464bd3628f2daa0e53efc639a22d825f8b774e07d6101cf1a
-  data.tar.gz: 3b3540a55ab7b27c99e1caf23fde8feb4c0765d3aad67e576002d8249ee6b8daabfc629994f982ba91170b702e891c8585506531c284cca3ab51de253211dced
+  metadata.gz: 7c08a8603f993acc6d7eae4e60fdda61620cfe57f8bb1317bb7cb8cf84ac2eefbe0b63b59629f45f168d548b694e9f94e4f034628de8f822ffc824114d6318d0
+  data.tar.gz: e926bfa00c22e54cafcabd80f0174eb0178bab25a1cbcfb8632aea1d5f607ba0300dbf59d082d462453a7b7923cb066deb9e49760c5ef65e37d68f16c03010d6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+0.11.3 (11/12/2019)
+-------------------
+
+* add a compat mode for running with terraform 0.11 [30052a1](https://github.com/simplygenius/atmos/commit/30052a1)
+* handle deleting a secret that doesn't exist [224c926](https://github.com/simplygenius/atmos/commit/224c926)
+* update rubyzip to avoid vulnerability [d46d817](https://github.com/simplygenius/atmos/commit/d46d817)
+
+
 0.11.2 (10/18/2019)
 -------------------
 

data/lib/simplygenius/atmos/commands/secret.rb

@@ -7,9 +7,7 @@ module SimplyGenius
 
       class Secret < BaseCommand
 
-        def self.description
-          "Manages application secrets"
-        end
+        banner "Manages application secrets"
 
         subcommand "get", "Gets the secret value" do
 
@@ -80,8 +78,12 @@ module SimplyGenius
             Atmos.config.provider.auth_manager.authenticate(ENV) do |auth_env|
               ClimateControl.modify(auth_env) do
                 value = Atmos.config.provider.secret_manager.get(key)
-                Atmos.config.provider.secret_manager.delete(key)
-                logger.info "Deleted secret: #{key}=#{value}"
+                if value
+                  Atmos.config.provider.secret_manager.delete(key)
+                  logger.info "Deleted secret: #{key}=#{value}"
+                else
+                  logger.warn "Key does not exist: #{key}"
+                end
               end
             end
 

data/lib/simplygenius/atmos/terraform_executor.rb

@@ -23,6 +23,7 @@ module SimplyGenius
         if @recipes.blank?
           logger.warn("Check your configuration, there are no recipes in '#{recipe_config_path}'")
         end
+        @compat11 = Atmos.config['atmos.terraform.compat11'].to_s == "true"
       end
 
       def run(*terraform_args, skip_backend: false, skip_secrets: false, get_modules: false, output_io: nil)
@@ -172,10 +173,19 @@ module SimplyGenius
         end
       end
 
-      # terraform currently (v0.11.7) doesn't handle maps with nested maps or
-      # lists well, so flatten them - nested maps get expanded into the top level
-      # one, with their keys being appended with underscores, and lists get
-      # joined with "," so we end up with a single hash with homogenous types
+      def homogenize_encode(v)
+        case v
+        when nil
+          @compat11 ? "" : v
+        else
+          v
+        end
+      end
+
+      # terraform requires all values within a map to have the same type, so
+      # flatten the map - nested maps get expanded into the top level one, with
+      # their keys being appended with underscores, and lists get joined with
+      # "," so we end up with a single hash with homogenous types
       #
       def homogenize_for_terraform(obj, prefix="")
         if obj.is_a? Hash
@@ -185,7 +195,7 @@ module SimplyGenius
             if ho.is_a? Hash
               result = result.merge(ho)
             else
-              result["#{prefix}#{k}"] = ho
+              result["#{prefix}#{k}"] = homogenize_encode(ho)
             end
           end
           return result
@@ -194,15 +204,41 @@ module SimplyGenius
           obj.each do |o|
             ho = homogenize_for_terraform(o, prefix)
             if ho.is_a? Hash
-              result << ho.collect {|k, v| "#{k}=#{v}"}.join(";")
+              result << ho.collect {|k, v| "#{k}=#{homogenize_encode(v)}"}.join(";")
             else
-              result << ho
+              result << homogenize_encode(ho)
             end
           end
           return result.join(",")
         else
-          return obj
+          return homogenize_encode(obj)
+        end
+      end
+
+      def encode_tf_env_value(v)
+        case v
+        when nil
+          @compat11 ? "" : JSON.generate(v)
+        when Numeric, String, TrueClass, FalseClass
+          v.to_s
+        when Hash
+          if @compat11
+            hcl_hash =v.collect {|k, v| %Q("#{k.to_s}"="#{encode_tf_env_value(v)}") }.join(",")
+            "{#{hcl_hash}}"
+          else
+            JSON.generate(v)
+          end
+        else
+          JSON.generate(v)
+        end
+      end
+
+      def encode_tf_env(hash)
+        result = {}
+        hash.each do |k, v|
+          result["TF_VAR_#{k}"] = encode_tf_env_value(v)
         end
+        return result
       end
 
       def tf_recipes_dir
@@ -221,34 +257,30 @@ module SimplyGenius
         # ENV, so kinda clunk to have to do both CC and pass the env in
         ClimateControl.modify(@process_env) do
           secrets = Atmos.config.provider.secret_manager.to_h
-          env_secrets = Hash[secrets.collect { |k, v| ["TF_VAR_#{k}", v] }]
+          env_secrets = encode_tf_env(secrets)
           return env_secrets
         end
       end
 
+      # TODO: Add ability to declare variables as well as set them.  May need to
+      # inspect existing tf to find all declared vars so we don't double declare
       def atmos_env
         # A var value in the env is ignored if a variable declaration doesn't exist for it in a tf file.  Thus,
         # as a convenience to allow everything from atmos to be referenceable, we put everything from the atmos_config
         # in a homogenized hash named atmos_config which is declared by the atmos scaffolding.  For variables which are
-        # declared, we also merge in atmos config with only the values homogenized (vs the entire map) so that hash
+        # declared, we also merge in atmos config with only the hash values homogenized (vs the entire map) so that hash
         # variables if declared in terraform can be managed from yml, set here and accessed from terraform
         #
         homogenized_config = homogenize_for_terraform(Atmos.config.to_h)
+        homogenized_values = Hash[Atmos.config.to_h.collect {|k, v| [k, v.is_a?(Hash) ? homogenize_for_terraform(v) : v]}]
         var_hash = {
             all_env_names: Atmos.config.all_env_names,
             account_ids: Atmos.config.account_hash,
             atmos_config: homogenized_config
         }
-        var_hash = var_hash.merge(Atmos.config.to_h)
-        env_hash = Hash[var_hash.collect do |k, v|
-          encoded_val = case v
-          when Numeric, String, TrueClass, FalseClass
-            v.to_s
-          else
-            JSON.generate(v)
-          end
-          ["TF_VAR_#{k}", encoded_val]
-        end]
+        var_hash = var_hash.merge(homogenized_values)
+
+        env_hash = encode_tf_env(var_hash)
 
         # write out a file so users have some visibility into vars passed in -
         # mostly useful for debugging
@@ -269,8 +301,9 @@ module SimplyGenius
       end
 
       def link_support_dirs
-        ['modules', 'templates'].each do |subdir|
-          ln_sf(File.join(Atmos.config.root_dir, subdir), Atmos.config.tf_working_dir)
+        ['modules', 'templates', '.terraform-version'].each do |subdir|
+          source = File.join(Atmos.config.root_dir, subdir)
+          ln_sf(source, Atmos.config.tf_working_dir) if File.exist?(source)
         end
       end
 

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.11.2"
+    VERSION = "0.11.3"
   end
 end

data/templates/new/config/atmos/runtime.yml

@@ -75,3 +75,5 @@ atmos:
     # env/group combination will be independent and download all plugins for
     # itself only
     disable_shared_plugins: false
+    # Set true if running terraform version < 0.11.x
+    compat11: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement