simplygenius-atmos 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ca7971744542f8e7e8b9892a57425edbef56c418b22617295f539a4e737a62d
-  data.tar.gz: 7a2e7501ec94b617eb0bb3c1d91a37b76884ca57ebc079d4a14e367b41827063
+  metadata.gz: afa120dcd3c2081998e5a215a4590553a2545f699ad9cbd17e585b6f51784045
+  data.tar.gz: eeb60c1ed55ea88b7b34970cf752289b8a6eb7f64b67221e063a5f27ce1949f4
 SHA512:
-  metadata.gz: 4fff280b4474c41e9329bc49ecfdd7ae215fbb2fd33b45161e94056126710bdca0d8461379029ed45ae23672724cce10cd61d7b79413190738d8b8a3121ad42d
-  data.tar.gz: 6d9801ed068c5c007d67e7f0c086134db4aa396a7e6b9c0a983cfa2ac3711ac7c4bd8eeb6092b82011362ed25d79a4bb9f7dfce243470ce928232a256f88efee
+  metadata.gz: 964094b4a7e12e23dadb011872cb5cddde9353e472d0cf17f1c168ae3a66ff4fddceca55a1a20c4d0bd8886e87937de717e84ffe60c08b89bd4513867ad8a2c8
+  data.tar.gz: 381ed5d125cd3dc1fca56d30e6d1e13c2356f4e5c61320e02d808d5180d7f7f00d86a36e72c630ce2842955183d4a49952bd92ee18fa82a0aaac3e2c7de804cb

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.11.5 (12/12/2019)
+-------------------
+
+* fix usage to include exe name and add -v for checking version [64a6183](https://github.com/simplygenius/atmos/commit/64a6183)
+* allow setting atmos root/config_file from env, and pass it down to subprocesses so that tfutil can act the same from the terraform working dir [c417d4c](https://github.com/simplygenius/atmos/commit/c417d4c)
+* add tfutil.jsonify to make it easier to call out from terraform data.external [c9bfdf5](https://github.com/simplygenius/atmos/commit/c9bfdf5)
+* add ability to dump config as json [9e6176f](https://github.com/simplygenius/atmos/commit/9e6176f)
+* allow customization of what gets linked into terraform working dir [115e460](https://github.com/simplygenius/atmos/commit/115e460)
+
+
 0.11.4 (11/27/2019)
 -------------------
 

data/lib/simplygenius/atmos/cli.rb

@@ -51,6 +51,9 @@ module SimplyGenius
              "PATH", "adds additional paths to ruby load path",
              multivalued: true
 
+      option ["-v", "--version"],
+             :flag, "Shows the atmos version"
+
       def default_color?
          $stdout.tty?
       end
@@ -88,6 +91,8 @@ module SimplyGenius
                  Commands::AuthExec
       subcommand "container", "Container tools",
                  Commands::Container
+      subcommand "tfutil", "Terraform tools",
+                 Commands::TfUtil
 
       subcommand "version", "Display version" do
         def execute
@@ -96,8 +101,17 @@ module SimplyGenius
       end
 
       subcommand "config", "Display expanded config for atmos_env" do
+
+        option ["-j", "--json"],
+               :flag, "Dump config as json instead of yaml"
+
         def execute
-          logger.info YAML.dump(Atmos.config.to_h)
+          if json?
+            output = JSON.pretty_generate(Atmos.config.to_h)
+          else
+            output = YAML.dump(Atmos.config.to_h)
+          end
+          logger.info output
         end
       end
 
@@ -118,14 +132,26 @@ module SimplyGenius
 
           Atmos.config.add_user_load_path(*load_path_list)
           Atmos.config.plugin_manager.load_plugins
+
+          # So we can show just the version with the -v flag
+          if version?
+            logger.info "Atmos Version #{VERSION}"
+            exit(0)
+          end
         end
       end
 
       # Hook into clamp lifecycle to globally handle errors
       class << self
-        def run(*args, **opts, &blk)
+        def run(invocation_path = File.basename($PROGRAM_NAME), arguments = ARGV, context = {})
           begin
             super
+          rescue SystemExit => e
+            if ! e.success?
+              logger.log_exception(e, "Failure exit", level: :debug)
+              logger.error(e.message)
+              raise
+            end
           rescue Exception => e
             logger.log_exception(e, "Unhandled exception", level: :debug)
             logger.error(e.message)

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

@@ -0,0 +1,129 @@
+require_relative 'base_command'
+require 'json'
+require 'open3'
+require 'clipboard'
+
+module SimplyGenius
+  module Atmos
+    module Commands
+
+      class TfUtil < BaseCommand
+
+        def self.description
+          "Useful utilities when calling out from terraform with data.external"
+        end
+
+        subcommand "jsonify", "Manages json on stdin/out to conform\nto use in terraform data.external" do
+
+          banner "Ensures json output only contains a single level Hash with string values (e.g. when execing curl returns a deep json hash of mixed values)"
+
+          option ["-a", "--atmos_config"],
+                 :flag, "Includes the atmos config in the\nhash from parsing json on stdin"
+
+          option ["-c", "--clipboard"],
+                 :flag, "Copies the actual command used\nto the clipboard to allow external debugging"
+
+          option ["-j", "--json"],
+                 :flag, "The command output is parsed as json"
+
+          option ["-x", "--[no-]exit"],
+                 :flag, "Exit with the command's exit code\non failure (or not)", default: true
+
+          parameter "COMMAND ...",
+                    "The command to call", :attribute_name => :command
+
+          # Recursively converts all values to strings as required by terraform data.external
+          def stringify(obj)
+            case obj
+            when Hash
+              Hash[obj.collect {|k, v| [k, stringify(v)] }]
+            when Array
+              obj.collect {|v| stringify(v) }
+            else
+              obj.to_s
+            end
+          end
+
+          # Makes a hash have only a single level as required by terraform data.external
+          def flatten(obj)
+            result = {}
+
+            if obj.is_a? Hash
+              obj.each do |k, v|
+                ev = case v
+                     when String
+                       v
+                     when Hash, Array
+                       JSON.generate(v)
+                     else
+                       v.to_s
+                     end
+                result[k] = ev
+              end
+            else
+              result["data"] = JSON.generate(result)
+            end
+
+            return result
+          end
+
+          def maybe_read_stdin
+            data = nil
+            begin
+              chunk = $stdin.read_nonblock(1)
+              data = chunk + $stdin.read
+              logger.debug("Received stdin: " + data)
+            rescue Errno::EAGAIN
+              data = nil
+              logger.debug("No stdin")
+            end
+            return data
+          end
+
+          def execute
+            params = JSON.parse(maybe_read_stdin || '{}')
+            params = SettingsHash.new(params)
+            params.enable_expansion = true
+            if atmos_config?
+              params = Atmos.config.config_merge(SettingsHash.new(Atmos.config.to_h), params)
+            end
+            expanded_command = command.collect {|c| params.expand_string(c) }
+
+            begin
+              formatted_command = expanded_command.collect {|a| "'#{a}'" }.join(" ")
+              logger.debug("Running command: #{formatted_command}")
+              Clipboard.copy(formatted_command) if clipboard?
+
+              cmd_opts = {}
+              cmd_opts[:stdin_data] = params[:stdin] if params.key?(:stdin)
+              stdout, stderr, status = Open3.capture3(*expanded_command, **cmd_opts)
+              result = {stdout: stdout, stderr: stderr, exitcode: status.exitstatus.to_s}
+              logger.debug("Command result: #{result.inspect}")
+
+              if exit? && status.exitstatus != 0
+                $stderr.puts stdout
+                $stderr.puts stderr
+                exit status.exitstatus
+              end
+
+              if json?
+                result = result.merge(flatten(stringify(JSON.parse(stdout))))
+              end
+
+              logger.debug("Json output: #{result.inspect}")
+              $stdout.puts JSON.generate(result)
+
+            rescue => e
+              $stderr.puts("#{e.class}: #{e.message}")
+              exit 1
+            end
+
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/simplygenius/atmos/config.rb

@@ -19,11 +19,11 @@ module SimplyGenius
                     :user_config_file,
                     :tmp_root
 
-      def initialize(atmos_env, working_group = 'default')
+      def initialize(atmos_env, working_group = 'default', root: ENV['ATMOS_ROOT'], config: ENV['ATMOS_CONFIG'])
         @atmos_env = atmos_env
         @working_group = working_group
-        @root_dir = File.expand_path(Dir.pwd)
-        @config_file = File.join(root_dir, "config", "atmos.yml")
+        @root_dir = File.expand_path(root || Dir.pwd)
+        @config_file = config ? File.expand_path(config, root_dir) : File.join(root_dir, "config", "atmos.yml")
         @user_config_file = "~/.atmos.yml"
         @tmp_root = File.join(root_dir, "tmp")
         @included_configs = []
@@ -119,8 +119,6 @@ module SimplyGenius
         File.chmod(0600, user_config_file)
       end
 
-      private
-
       def config_merge(lhs, rhs, debug_state=[])
         result = nil
 
@@ -168,6 +166,8 @@ module SimplyGenius
         return result
       end
 
+      private
+
       def load_config_sources(relative_root, config, *patterns)
         patterns.each do |pattern|
           logger.debug("Loading atmos config files using pattern: #{pattern}")

data/lib/simplygenius/atmos/terraform_executor.rb

@@ -54,6 +54,8 @@ module SimplyGenius
         logger.debug("Running terraform: #{cmd.join(' ')}")
 
         env = Hash[@process_env]
+        env['ATMOS_ROOT'] = Atmos.config.root_dir
+        env['ATMOS_CONFIG'] = Atmos.config.config_file
         if ! skip_secrets
           begin
             env = env.merge(secrets_env)
@@ -84,7 +86,7 @@ module SimplyGenius
 
             stdout_thr = pipe_stream(stdout, output_io.nil? ? $stdout : output_io, &stdout_filters.filter_block)
             stderr_thr = pipe_stream(stderr, output_io.nil? ? $stderr : output_io, &stderr_filters.filter_block)
-
+            status = nil
             ipc.listen do |sock_path|
 
               if Atmos.config['atmos.ipc.disable']
@@ -111,12 +113,12 @@ module SimplyGenius
 
               logger.debug("Terraform started with pid #{pid}")
               begin
-                Process.wait(pid)
+                _, status = Process.wait2(pid)
               rescue Interrupt
                 logger.warn "Got SIGINT, sending to terraform pid=#{pid}"
 
                 Process.kill("INT", pid)
-                Process.wait(pid)
+                _, status = Process.wait2(pid)
 
                 logger.debug "Completed signal cleanup"
                 exit!(1)
@@ -131,10 +133,10 @@ module SimplyGenius
             stdout_filters.close
             stderr_filters.close
 
-            status = $?.exitstatus
-            logger.debug("Terraform exited: #{status}")
-            if status != 0
-              raise ProcessFailed.new "Terraform exited with non-zero exit code: #{status}"
+            exitcode = status.exitstatus
+            logger.debug("Terraform exited: #{exitcode}")
+            if exitcode != 0
+              raise ProcessFailed.new "Terraform exited with non-zero exit code: #{exitcode}"
             end
 
           end
@@ -301,7 +303,9 @@ module SimplyGenius
       end
 
       def link_support_dirs
-        ['modules', 'templates', '.terraform-version'].each do |subdir|
+        working_dir_links = Atmos.config['atmos.terraform.working_dir_links']
+        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)
         end

data/lib/simplygenius/atmos/version.rb

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

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

@@ -120,5 +120,8 @@ atmos:
     # 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
+    working_dir_links: ['modules', 'templates', 'bin', '.terraform-version']
     # 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.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -531,6 +531,7 @@ files:
 - lib/simplygenius/atmos/commands/plan.rb
 - lib/simplygenius/atmos/commands/secret.rb
 - lib/simplygenius/atmos/commands/terraform.rb
+- lib/simplygenius/atmos/commands/tfutil.rb
 - lib/simplygenius/atmos/commands/user.rb
 - lib/simplygenius/atmos/config.rb
 - lib/simplygenius/atmos/exceptions.rb