simplygenius-atmos 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ee93da3ad938995a76994c9652134b9761f7dd79dbb848667655b36c666c37
-  data.tar.gz: 3a6cfa01bf2693dd9ffb3b8b95ff9c9a8a989eb1bc954a385b5b58603da671da
+  metadata.gz: c9f69449d48427430bc31762edb6359ac810e1fc32cf94d8ce051df7a6cb92b4
+  data.tar.gz: 1dcb2ed97a319a93f5f87462c1553c898132f23f04dc90cf43807a87cc196ae3
 SHA512:
-  metadata.gz: 778183427db0fcc75a8dd2a9365ad7a12824d7d1271333044896d130b58d371ae824c97e888fc2f125e0946beccd1d2bdc6f830238383321511b5a73774bd594
-  data.tar.gz: bb37c2acdac734795af2c6c1b7182fc97d07d46e74181b0d4257618b1e1b1318a054e5acbf53214cd7e971702d423d16e62674780f7772316ee1a3b1465f9422
+  metadata.gz: ef543813c52188072ddf10a179174fb6aee0b19fbcc6787fe0d10c928875481606554b18b43d782724624f1f3d61ee8d500dd9bb89cb1ac21bb3d61663541933
+  data.tar.gz: 9a020c0a2b66a38e0a2f2145e03fdedede9792c18c83906c1b7191de1c7affa06d58e2fba573ebf751db58dbacea0be9d9b0abd26593cdf40f5dad82a2ca43b3

data/CHANGELOG.md

@@ -1,3 +1,68 @@
+0.9.1 (11/30/2018)
+------------------
+
+* fix some json weirdness with ruby v2.3 vs 2.5 and active support [82c02d1](https://github.com/simplygenius/atmos/commit/82c02d1)
+* docker tweaks [f44c9b1](https://github.com/simplygenius/atmos/commit/f44c9b1)
+* warn instead of trace for empty recipe config [7c83238](https://github.com/simplygenius/atmos/commit/7c83238)
+* fix docker based runtime, pass through more mounts and skip aws cli based auth lookup as it slowed things down too much [f9844e9](https://github.com/simplygenius/atmos/commit/f9844e9)
+
+0.9.0 (10/18/2018)
+------------------
+
+* change terraform plugin sharing to do so by copying the plugins to the home directory location that is searched by terraform . [9779685](https://github.com/simplygenius/atmos/commit/9779685)
+* fix comment [58e51a1](https://github.com/simplygenius/atmos/commit/58e51a1)
+* handle empty config files [8f48c98](https://github.com/simplygenius/atmos/commit/8f48c98)
+* push working group up to main cli and add to atmos config so that we can reference it in backend state key [ca87c24](https://github.com/simplygenius/atmos/commit/ca87c24)
+* move all but config location to atmos runtime config [3f86a3e](https://github.com/simplygenius/atmos/commit/3f86a3e)
+* fix dev tools [1edf4e2](https://github.com/simplygenius/atmos/commit/1edf4e2)
+* version constrain all the dependencies [cdce71f](https://github.com/simplygenius/atmos/commit/cdce71f)
+* make explicit the use of working_group for state key by passing in atmos_working_group as a terraform variable [83a581f](https://github.com/simplygenius/atmos/commit/83a581f)
+* move atmos vars in yml into their own namespace [705beda](https://github.com/simplygenius/atmos/commit/705beda)
+* force hashie version [e52cd93](https://github.com/simplygenius/atmos/commit/e52cd93)
+* fix to work with ruby 2.3 [b2612ec](https://github.com/simplygenius/atmos/commit/b2612ec)
+* log load path [3b4945d](https://github.com/simplygenius/atmos/commit/3b4945d)
+* add ability to add to ruby load path from cli/config [e13935b](https://github.com/simplygenius/atmos/commit/e13935b)
+* allow templates to directly reference scoped context with method_missing (lets skip assigning a var when asking questions) [8cf203e](https://github.com/simplygenius/atmos/commit/8cf203e)
+* fix doc strinng [7257229](https://github.com/simplygenius/atmos/commit/7257229)
+* add choose to ui in templates [efb7047](https://github.com/simplygenius/atmos/commit/efb7047)
+* add update to generator to allow applying all previously installed templates [2faa6e9](https://github.com/simplygenius/atmos/commit/2faa6e9)
+* make state file be plain yaml (no atmos class refs) [625d508](https://github.com/simplygenius/atmos/commit/625d508)
+* allow disabling built in sourcepaths from cli [64a2c18](https://github.com/simplygenius/atmos/commit/64a2c18)
+* refactor loading of env/providers so they can be in a dedicated file [fedf915](https://github.com/simplygenius/atmos/commit/fedf915)
+* extract recipes to own yml [518e1b7](https://github.com/simplygenius/atmos/commit/518e1b7)
+* plugin config tweaks [3cbc19e](https://github.com/simplygenius/atmos/commit/3cbc19e)
+* allow custom config sources [9d82d09](https://github.com/simplygenius/atmos/commit/9d82d09)
+* refactor template/context/hash mess into template class, fix a number of issues with context, disallow duplicate template names for now, add initial state tracking [e00a4dc](https://github.com/simplygenius/atmos/commit/e00a4dc)
+* add context, allow UI to get answers from context, fix dependency traversal to handle context [43584d3](https://github.com/simplygenius/atmos/commit/43584d3)
+* cleanup plugins, allow per-plugin config [89c9f96](https://github.com/simplygenius/atmos/commit/89c9f96)
+* handle inline as an option to notify [de7afff](https://github.com/simplygenius/atmos/commit/de7afff)
+* remove debug [463ad0d](https://github.com/simplygenius/atmos/commit/463ad0d)
+* fix sourcepath directory expansion [e41304c](https://github.com/simplygenius/atmos/commit/e41304c)
+* rework generators to allow disambiguation template name duplication across sources, and to prepare for saving a list of all installed templates and fully qualifying templates names by source [b06fa68](https://github.com/simplygenius/atmos/commit/b06fa68)
+* separate plugin loading from initialization [e0801d0](https://github.com/simplygenius/atmos/commit/e0801d0)
+* add in simplygenius to namespace, refactor to handle namespacing better (Module.nesting) across code/tests [168af71](https://github.com/simplygenius/atmos/commit/168af71)
+* update pro release sources [454b054](https://github.com/simplygenius/atmos/commit/454b054)
+* helper for local plugin dev [1479604](https://github.com/simplygenius/atmos/commit/1479604)
+* add basic plugin mechanism and refactor terraform output filtering as a plugin [29e32a3](https://github.com/simplygenius/atmos/commit/29e32a3)
+* add passthrough to highline choose for menus [d9cda18](https://github.com/simplygenius/atmos/commit/d9cda18)
+* write auth cache when auto renewing session [bc2f8f9](https://github.com/simplygenius/atmos/commit/bc2f8f9)
+* handle interrupts [f8db090](https://github.com/simplygenius/atmos/commit/f8db090)
+* try to fix travis error [cceaf43](https://github.com/simplygenius/atmos/commit/cceaf43)
+* newer bundler [eaffeba](https://github.com/simplygenius/atmos/commit/eaffeba)
+* fix test [030d8c4](https://github.com/simplygenius/atmos/commit/030d8c4)
+* version update [0257e0c](https://github.com/simplygenius/atmos/commit/0257e0c)
+* use eq [8e7eccc](https://github.com/simplygenius/atmos/commit/8e7eccc)
+* show exe output on fail [e2fecf4](https://github.com/simplygenius/atmos/commit/e2fecf4)
+* fix/add tests for username in assume role session [5ff99ff](https://github.com/simplygenius/atmos/commit/5ff99ff)
+* add username to assume role session name for easier tracking, e.g. in cloudtrail [585a974](https://github.com/simplygenius/atmos/commit/585a974)
+* added custom merge logic that works better and removes hacks [d668dd9](https://github.com/simplygenius/atmos/commit/d668dd9)
+* fix homogenize of atmos_config, and don't homogenize yaml that gets directly added so that yml can be used to set values for maps/list for declared vars [7e1c221](https://github.com/simplygenius/atmos/commit/7e1c221)
+* do an additive merge of lists in config as its more useable in the average case of adding to a default [d9d654d](https://github.com/simplygenius/atmos/commit/d9d654d)
+* test more ruby versions [8733d46](https://github.com/simplygenius/atmos/commit/8733d46)
+* fix permalink to atmos-pro [c0e6a57](https://github.com/simplygenius/atmos/commit/c0e6a57)
+* readme tweaks [16db27a](https://github.com/simplygenius/atmos/commit/16db27a)
+* helper for tagging recipe repos when releasing [9632bee](https://github.com/simplygenius/atmos/commit/9632bee)
+
 0.7.1 (05/03/2018)
 ------------------
 

data/exe/atmos-docker

@@ -4,24 +4,20 @@
 set -e
 
 APP_VOLUME=${IMAGE_APP_VOLUME:-/app}
+ATMOS_IMAGE=${ATMOS_IMAGE:-simplygenius/atmos}
 
-if [[ -z $AWS_ACCESS_KEY_ID || -z $AWS_SECRET_ACCESS_KEY ]]; then
-  if command -v aws &> /dev/null; then
-    export AWS_ACCESS_KEY_ID=$(aws configure get aws_access_key_id)
-    export AWS_SECRET_ACCESS_KEY=$(aws configure get aws_secret_access_key)
-    export AWS_REGION=$(aws configure get region)
-  else
-    echo "Usage through docker requires that access keys to be set in the environment"
-    echo "Install the aws cli to automatically look them up based on a profile name"
-    exit 1
+home_mounts=".aws .terraform.d .atmos.yml"
+mounts=""
+for mount in $home_mounts; do
+  if [[ -e $HOME/$mount ]]; then
+    mounts="$mounts --mount type=bind,source=$HOME/$mount,target=/root/$mount"
   fi
-fi
+done
 
 docker run \
   --interactive --tty --rm \
   --volume "$(pwd)":"${APP_VOLUME}" \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  --env AWS_ACCESS_KEY_ID \
-  --env AWS_SECRET_ACCESS_KEY \
-  --env AWS_REGION \
-  simplygenius/atmos "$@"
+  $mounts \
+  --env-file <(env | grep "^AWS\|^ATMOS\|^TF") \
+  $ATMOS_IMAGE "$@"

data/lib/simplygenius/atmos/terraform_executor.rb

@@ -18,7 +18,11 @@ module SimplyGenius
 
       def initialize(process_env: ENV)
         @process_env = process_env
-        @recipes = Atmos.config["recipes.#{Atmos.config.working_group}"]
+        recipe_config_path = "recipes.#{Atmos.config.working_group}"
+        @recipes = Array(Atmos.config[recipe_config_path])
+        if @recipes.blank?
+          logger.warn("Check your configuration, there are no recipes in '#{recipe_config_path}'")
+        end
       end
 
       def run(*terraform_args, skip_backend: false, skip_secrets: false, get_modules: false, output_io: nil)

data/lib/simplygenius/atmos/ui.rb

@@ -2,6 +2,7 @@ require_relative '../atmos'
 require 'highline'
 require 'rainbow'
 require 'yaml'
+require 'json'
 require 'open3'
 require 'os'
 require 'hashie'
@@ -121,12 +122,13 @@ module SimplyGenius
         elsif OS.mac? && ! force_inline
           display_method = modal ? "displayDialog" : "displayNotification"
 
+          # Usse to_json as JSON.generate doesn't work for strings on ruby 2.3
           dialogScript = <<~EOF
             var app = Application.currentApplication();
             app.includeStandardAdditions = true;
             app.#{display_method}(
-              #{JSON.generate(message)}, {
-                withTitle: #{JSON.generate(title)},
+              #{message.to_json}, {
+                withTitle: #{title.to_json},
                 buttons: ['OK'],
                 defaultButton: 1
             })

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/lib/simplygenius/atmos.rb

@@ -1,4 +1,13 @@
 require_relative 'atmos/version'
+
+# FIXME: Force active support json to prevent some weird errors.  We don't really rely
+# on it, but guessing some gem does and causes a breakage when calling to_json in
+# ui.rb when running its spec:
+# NameError: uninitialized constant ActiveSupport::JSON Did you mean?  JSON
+#
+require 'active_support/json'
+require 'active_support/core_ext/object/json'
+
 require 'active_support/core_ext/string'
 require 'active_support/concern'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler