simplygenius-atmos 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa120dcd3c2081998e5a215a4590553a2545f699ad9cbd17e585b6f51784045
-  data.tar.gz: eeb60c1ed55ea88b7b34970cf752289b8a6eb7f64b67221e063a5f27ce1949f4
+  metadata.gz: 4c93be3775fa963635eb0bd321ec575ba1d614443cc748b8e163026bc39e9bb6
+  data.tar.gz: a2b4c8a63334617cd90c4171895dd983cc369f5ceb4fe87f9b8cff653f66da7f
 SHA512:
-  metadata.gz: 964094b4a7e12e23dadb011872cb5cddde9353e472d0cf17f1c168ae3a66ff4fddceca55a1a20c4d0bd8886e87937de717e84ffe60c08b89bd4513867ad8a2c8
-  data.tar.gz: 381ed5d125cd3dc1fca56d30e6d1e13c2356f4e5c61320e02d808d5180d7f7f00d86a36e72c630ce2842955183d4a49952bd92ee18fa82a0aaac3e2c7de804cb
+  metadata.gz: b99184520a48ed489c1981f19f9e179c62561358e072c56fe4fb2b37ed32cfe97aeb80604b371de0614aacb61b75f0f001d2f35bf538499a496f4b12fefd0592
+  data.tar.gz: ee9183b0cf0c94aa315aead82412cc5f3c432b9b78ab5e73e610041f4b5ad2bb8d7728e9d67d8df09d7e014bc5e5c8f633f3b0968ba0071372de9db233938261

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.11.6 (01/03/2020)
+-------------------
+
+* fix passing of complex types from atmos to terraform for 0.12 and up [1df9b3d](https://github.com/simplygenius/atmos/commit/1df9b3d)
+
 0.11.5 (12/12/2019)
 -------------------
 

data/lib/simplygenius/atmos/terraform_executor.rb

@@ -274,13 +274,24 @@ module SimplyGenius
         # 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(homogenized_values)
+
+        # Terraform > 0.12 can have more complex data types (deeply nested
+        # maps), so if not enforcing 0.11 compatibility, we should preserve that
+        # structure for vars, but still homogenize in compat mode.  This way,
+        # assuming the var defined in tf source has constraints that match the
+        # yml definition, then it will get populated correctly after all the
+        # atmos niceties like merging env specific overrides into a default
+        if @compat11
+          homogenized_values = Hash[Atmos.config.to_h.collect {|k, v| [k, v.is_a?(Hash) ? homogenize_for_terraform(v) : v]}]
+          var_hash = var_hash.merge(homogenized_values)
+        else
+          var_hash = var_hash.merge(Atmos.config.to_h)
+        end
 
         env_hash = encode_tf_env(var_hash)
 

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.11.5"
+    VERSION = "0.11.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler