simplygenius-atmos 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0c1304c504dd0cd09e353384793eeb0e7c09c1eb7935da83fef773ce9f99992
-  data.tar.gz: e56fef2966f91b07a1458788c0b17f92ecb3d846d7786b0ca6155f29388857ef
+  metadata.gz: 8846428ce92ec4a40ec6dae71e6bd2f71f6a782602ad8e28d9a8a22e59651377
+  data.tar.gz: 74660bb78c5161496d22cf251be0398c69aebbbce86e660ba00acadfc4440e5b
 SHA512:
-  metadata.gz: 0b35b9967562d7c81ec2e5847db3faf87f96ee30f8f5638d04fbf7d5b8fe239feeda42c6c9ca56e01af059f42df8080e40a4e977da8b6fbb13f7eeb53f6b79bf
-  data.tar.gz: b3defecd765a7ea210f22e87be82ea4e828227cf680f378afba0fa32fefc54428aa1d93a1c78e04251815a5de2e658b0ea46d44de3a5ed158beafb9ef5b6ed6b
+  metadata.gz: cfe43ece44f453e003602badf0d870e871fee7008418c515faa236b30906b4722565962022969594efab87f0e563fa493f0ed51c5ef39eafb09f9ee725a66059
+  data.tar.gz: 8fa18edccdce49eda87a21125a27d263047fa0545461fe9a44fcbda2d75a2c929db24b064d47de56bbc5131b480862b1ac1eb721d4a8d49f5c0fb9a42d8c40d6

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+0.11.0 (09/25/2019)
+-------------------
+
+#### Notes on major changes
+
+ * Upgraded to support using terraform 0.12 .  This should continue to work with terraform 0.11, but revving the minor version in case it introduces a breaking change.  Most of the breaking changes were in the atmos-recipes repo, but you can pin to an older version of that to avoid getting the 0.12 recipes.
+
+#### Full changelog
+
+* fix 2.3 test failure [c20f957](https://github.com/simplygenius/atmos/commit/c20f957)
+* terraform 0.12 conversion - fix passing of atmos variables to terraform process [cad8c8f](https://github.com/simplygenius/atmos/commit/cad8c8f)
+* add_config comment detection needs single quote empty strings [2ef430b](https://github.com/simplygenius/atmos/commit/2ef430b)
+* fix summary for terraform 0.12 [bccb915](https://github.com/simplygenius/atmos/commit/bccb915)
+* use empty string instead of null as terraform 0.12 now treats null differently [8dd3853](https://github.com/simplygenius/atmos/commit/8dd3853)
+
 0.10.1 (09/20/2019)
 -------------------
 

data/lib/simplygenius/atmos/config.rb

@@ -60,7 +60,7 @@ module SimplyGenius
 
       def all_env_names
         load
-        @full_config[:environments].keys
+        (@full_config[:environments] || {}).keys
       end
 
       def account_hash

data/lib/simplygenius/atmos/plugins/plan_summary.rb

@@ -33,7 +33,8 @@ module SimplyGenius
         end
 
         def summarize(data)
-          lines = data.lines.select {|l| l =~ /^[\e\[\dm\s]*[~+\-<]/ }.collect(&:chomp)
+          # Looking for +/-/~ at start within 2 spaces, could also look for lines that end with {
+          lines = data.lines.select {|l| l =~ /^[\e\[\dm]*\s{0,2}[~+\-<]/ }.collect(&:chomp)
           lines = lines.reject {|l| l =~ /-----/ }
           "Plan Summary:\n#{lines.join("\n")}"
         end

data/lib/simplygenius/atmos/terraform_executor.rb

@@ -61,6 +61,12 @@ module SimplyGenius
           end
         end
 
+        # TF 0.12 deprecates values for undeclared vars in an tfvars file, so
+        # put it in env instead as they claim that to be the expected way to do
+        # so and will continue to work
+        # https://github.com/hashicorp/terraform/issues/19424
+        env = env.merge(atmos_env)
+
         # lets tempfiles created by subprocesses be easily found by users
         env['TMPDIR'] = Atmos.config.tmp_dir
 
@@ -139,7 +145,6 @@ module SimplyGenius
         clean_links
         link_support_dirs
         link_recipes
-        write_atmos_vars
         setup_backend(skip_backend)
       end
 
@@ -209,25 +214,6 @@ module SimplyGenius
         end
       end
 
-      def write_atmos_vars
-        File.open(File.join(tf_recipes_dir, 'atmos.auto.tfvars.json'), 'w') do |f|
-          # A mapping in the auto vars file 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
-          # 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)
-          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)
-          f.puts(JSON.pretty_generate(var_hash))
-        end
-      end
-
       def secrets_env
         # NOTE use an auto-deleting temp file if passing secrets through env ends
         # up being problematic
@@ -240,6 +226,41 @@ module SimplyGenius
         end
       end
 
+      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
+        # 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)
+        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]
+
+        # write out a file so users have some visibility into vars passed in -
+        # mostly useful for debugging
+        File.open(File.join(tf_recipes_dir, 'atmos-tfvars.env'), 'w') do |f|
+          env_hash.each do |k, v|
+            f.puts("#{k}='#{v}'")
+          end
+        end
+
+        return env_hash
+      end
+
       def clean_links
         Find.find(Atmos.config.tf_working_dir) do |f|
           Find.prune if f =~ /\/.terraform\/modules\//

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.10.1"
+    VERSION = "0.11.0"
   end
 end

data/templates/new/config/atmos.yml

@@ -35,14 +35,14 @@ global_name_prefix: "#{org}-#{atmos_env}-"
 # The local name prefix for disambiguating resource names that have a local
 # scope (e.g. when running multiple environments in the same account)
 #
-local_name_prefix:
+local_name_prefix: ''
 
 # The prefix used for the resources global to the organization.  Setting this
 # to something like "#{org}-" will allow you to manage multiple orgs from the same
 # ops account without name conflicts.
 # Most people should leave this blank.
 #
-org_prefix:
+org_prefix: ''
 
 # Environment specific overrides.  When adding new environments place them
 # after the existing ones so that you don't end up with permission issues when

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler