simplygenius-atmos 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 184052156c0ecd551e93ad3a1cc212bc2132f5b77409348f1c0cedcb4740b353
-  data.tar.gz: 67b48fb4bb4f84a922ac2879bcd38273c552fa213983f2f2d461669f6eb06587
+  metadata.gz: e57a5d360cd9c6016f83847333f3bf1519e70a8b73b0203c969d79fdf5a5e3f0
+  data.tar.gz: 4307c006f083fb94fdf5155df08a18a43d2ad6493070d279502b9a2a87a73c34
 SHA512:
-  metadata.gz: 3f3a38df1a9759746af1999bd3e8e0fe542ddb89092a557b81720f470e7e12b3ea13eb814aa64b36f906a7534a0a96537c421bdd707cd45513e363a2c8bf8388
-  data.tar.gz: e68a88d3b25b8f307fec0ada80eb5f6eb9f97fdb6da550dec70db58483001b769e86873410d0328677f53ee32e9f910b0521b55a1f0ccf327668af6ad22f7546
+  metadata.gz: d084865f58d1dfe8081debef0ce69c7fd2ab1068d813d8d704a4dc40962337c883be4763a2b161d5b8df4d0f6edd34a28209f95abb780b964d3abeb6dd7a94ab
+  data.tar.gz: 9f5f91afd5545dc14a073c4dfea67b86b699ed4add68077896cb151c990d50d32089246fe03b08b372eb98bb2694e98166933ac072fd22578e654a48771bc5b2

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+0.13.0 (01/20/2021)
+-------------------
+
+#### Notes on major changes
+
+* Now testing the atmos runtime against terraform 0.14 (and 0.11, 0.13)
+* The ability to link files into the terraform execution directory was enhanced, but still doesn't work for the .terraform.lock.hcl as it is overwritten by terraform and doesn't follow the link  
+
+#### Full changelog
+
+* exclude some new taskdef attributes for creation of new taskdef during deploy [a01b997](https://github.com/simplygenius/atmos/commit/a01b997)
+* add debug logging for aws sdk logger [55dd303](https://github.com/simplygenius/atmos/commit/55dd303)
+* directory sorting made more consistent across platforms [13622ff](https://github.com/simplygenius/atmos/commit/13622ff)
+* switch ci/cd from travis to github actions [13622ff](https://github.com/simplygenius/atmos/commit/13622ff)
+* fix test for tf 0.14 [122f861](https://github.com/simplygenius/atmos/commit/122f861)
+* replace plugin sharing with built in terraform variant [eb75266](https://github.com/simplygenius/atmos/commit/eb75266)
+* allow more options for linking in non-tf files into working dir [9878336](https://github.com/simplygenius/atmos/commit/9878336)
+* sort secret list [6b2dbfe](https://github.com/simplygenius/atmos/commit/6b2dbfe)
+* Only run terraform init when needed [d77186b](https://github.com/simplygenius/atmos/commit/d77186b)
+
+
 0.12.1 (10/14/2020)
 -------------------
 

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/simplygenius/atmos.svg?branch=master)](https://travis-ci.org/simplygenius/atmos)
+[![Build Status](https://github.com/simplygenius/atmos/workflows/CD/badge.svg)](https://github.com/simplygenius/atmos/actions)
 [![Coverage Status](https://coveralls.io/repos/github/simplygenius/atmos/badge.svg?branch=master)](https://coveralls.io/github/simplygenius/atmos?branch=master)
 [![Gitter](https://badges.gitter.im/simplygenius/atmos.svg)](https://gitter.im/simplygenius/atmos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

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

@@ -15,8 +15,6 @@ module SimplyGenius
         def execute
           @terraform_arguments.insert(0, "init")
           super
-
-          init_shared_plugins
         end
 
       end

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

@@ -60,7 +60,7 @@ module SimplyGenius
             Atmos.config.provider.auth_manager.authenticate(ENV) do |auth_env|
               ClimateControl.modify(auth_env) do
                 logger.info "Secret keys are:"
-                Atmos.config.provider.secret_manager.to_h.keys.each {|k| logger.info k}
+                Atmos.config.provider.secret_manager.to_h.keys.sort.each {|k| logger.info k}
               end
             end
 

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

@@ -21,27 +21,23 @@ module SimplyGenius
         end
 
         def init_automatically(auth_env, get_modules)
-          tf_init_dir = File.join(Atmos.config.tf_working_dir, '.terraform')
+          tf_init_dir = File.join(Atmos.config.tf_working_dir, 'recipes', '.terraform')
           backend_initialized = File.exist?(File.join(tf_init_dir, 'terraform.tfstate'))
           auto_init_enabled = Atmos.config["atmos.terraform.auto_init"].to_s == "true"
 
           if auto_init && auto_init_enabled && ! backend_initialized
             exe = TerraformExecutor.new(process_env: auth_env)
             exe.run("init", get_modules: get_modules.present?)
-            init_shared_plugins
           end
         end
 
-        def init_shared_plugins
+        def enable_shared_plugins(env)
           if ! Atmos.config["atmos.terraform.disable_shared_plugins"]
             home_dir = OS.windows? ? File.join("~", "Application Data") : "~"
-            shared_plugins_dir = File.expand_path(File.join(home_dir,".terraform.d", "plugins"))
-            logger.debug("Updating shared terraform plugins dir: #{shared_plugins_dir}")
-            mkdir_p(shared_plugins_dir)
-            terraform_plugins_dir = File.join(Atmos.config.tf_working_dir,'recipes', '.terraform', 'plugins')
-            if File.exist?(terraform_plugins_dir)
-              cp_r("#{terraform_plugins_dir}/.", shared_plugins_dir)
-            end
+            plugin_cache_dir = File.expand_path(File.join(home_dir,".terraform.d", "plugin-cache"))
+            logger.debug("Plugin cache dir: #{plugin_cache_dir}")
+            mkdir_p(plugin_cache_dir)
+            env["TF_PLUGIN_CACHE_DIR"] = plugin_cache_dir
           end
         end
 
@@ -58,6 +54,8 @@ module SimplyGenius
             begin
               get_modules = @terraform_arguments.delete("--get-modules")
 
+              enable_shared_plugins(auth_env)
+
               init_automatically(auth_env, get_modules)
 
               exe = TerraformExecutor.new(process_env: auth_env)

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

@@ -73,9 +73,9 @@ module SimplyGenius
               chunk = $stdin.read_nonblock(1)
               data = chunk + $stdin.read
               logger.debug("Received stdin: " + data)
-            rescue Errno::EAGAIN
+            rescue EOFError, SystemCallError => e # All Errno exceptions
               data = nil
-              logger.debug("No stdin")
+              logger.debug("No stdin due to: #{e}")
             end
             return data
           end

data/lib/simplygenius/atmos/config.rb

@@ -219,7 +219,7 @@ module SimplyGenius
           pattern = File.expand_path(pattern)
           logger.debug("Expanded pattern: #{pattern}")
 
-          Dir[pattern].each do |f|
+          Dir[pattern].sort.each do |f|
             config = load_file(f, config)
           end
         end

data/lib/simplygenius/atmos/providers/aws/container_manager.rb

@@ -64,7 +64,8 @@ module SimplyGenius
 
             new_defn = latest_defn.to_h
             [:revision, :status, :task_definition_arn,
-             :requires_attributes, :compatibilities].each do |attr|
+             :requires_attributes, :compatibilities,
+             :registered_at, :registered_by].each do |attr|
               new_defn.delete(attr)
             end
             new_defn[:container_definitions].each {|c| c[:image] = remote_image}

data/lib/simplygenius/atmos/providers/aws/provider.rb

@@ -1,5 +1,7 @@
 require_relative '../../../atmos'
 
+require 'aws-sdk-core'
+
 Dir.glob(File.join(__dir__, '*.rb')) do |f|
   require_relative "#{File.basename(f).sub(/\.rb$/, "")}"
 end
@@ -11,6 +13,7 @@ module SimplyGenius
 
         class Provider
           include GemLogger::LoggerSupport
+          ::Aws.config.update(logger: logger, log_level: :debug)
 
           def initialize(name)
             @name = name

data/lib/simplygenius/atmos/terraform_executor.rb

@@ -308,7 +308,7 @@ module SimplyGenius
 
       def clean_links
         Find.find(Atmos.config.tf_working_dir) do |f|
-          Find.prune if f =~ /\/.terraform\/modules\//
+          Find.prune if f =~ /\/.terraform\//
           File.delete(f) if File.symlink?(f)
         end
       end
@@ -318,13 +318,30 @@ module SimplyGenius
         working_dir_links ||= ['modules', 'templates']
         working_dir_links.each do |subdir|
           source = File.join(Atmos.config.root_dir, subdir)
-          ln_sf(source, Atmos.config.tf_working_dir) if File.exist?(source)
+          parts = File.split(subdir)
+          target_dir = Atmos.config.tf_working_dir
+          if parts[0] != "."
+            target_dir = File.join(Atmos.config.tf_working_dir, parts[0])
+            mkdir_p(target_dir)
+          end
+          ln_sf(source, target_dir) if File.exist?(source)
         end
       end
 
       def link_recipes
         @recipes.each do |recipe|
-          ln_sf(File.join(Atmos.config.root_dir, 'recipes', "#{recipe}.tf"), tf_recipes_dir)
+          recipe_satisfied = false
+          ["#{recipe}.tf", recipe].each do |recipe_variant|
+            fqrecipe = File.join(Atmos.config.root_dir, 'recipes', recipe_variant)
+            if File.exist?(fqrecipe)
+              ln_sf(fqrecipe, tf_recipes_dir)
+              recipe_satisfied = true
+              break
+            else
+              logger.debug("Recipe target does not exist: #{fqrecipe}")
+            end
+          end
+          logger.error("Recipe '#{recipe}' is not present") unless recipe_satisfied
         end
       end
 

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.12.1"
+    VERSION = "0.13.0"
   end
 end

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

@@ -119,12 +119,12 @@ atmos:
   terraform:
     # Disable module fetch from convenience plan/apply commands
     disable_auto_modules: false
-    # By default (value=false), `atmos init` will update the terraform user
-    # plugin directory (~/.terraform.d/plugins) with the plugins for the current
-    # env/group so that they can be reused across all env/group combinations.
-    # Otherwise, disabling this functionality (value=true) means that each
-    # env/group combination will be independent and download all plugins for
-    # itself only
+    # By default (value=false), `atmos init` (and auto init) will set
+    # TF_PLUGIN_CACHE_DIR to ~/.terraform.d/plugin-cache so that when terraform
+    # installs providers/plugins they can be reused across all env/group
+    # combinations. Otherwise, disabling this functionality (value=true) means
+    # that each env/group combination will be independent and download all
+    # plugins for itself only
     disable_shared_plugins: false
     # Customize what gets linked into the working directory that terraform gets
     # executed in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Matt Conway
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler