simplygenius-atmos 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5761d35141b55d13b0e372081647d0a898aa0dda202d12c02f4c6728d671600f
-  data.tar.gz: b2b0650b44c07c757f106b7f8f4c55ac3a0b44457f337c06620adb934340db16
+  metadata.gz: 10ee93da3ad938995a76994c9652134b9761f7dd79dbb848667655b36c666c37
+  data.tar.gz: 3a6cfa01bf2693dd9ffb3b8b95ff9c9a8a989eb1bc954a385b5b58603da671da
 SHA512:
-  metadata.gz: 889d94f2c5743bccab0a8e53d76a936585f4410bd1a18ee9df46036da8a3b718833a73f8aaed475ae1278708532f113f4f96b7dc43833bef8b5bab7fac0520d6
-  data.tar.gz: 87c5c8896b562ed95898584284a741bb0d7dc903e0365e197054f73e00c795eaf4200a6c0ec4cfccc8a66f4aa5f15c0ede4e8e7c16b628ce83cdf6eb96deb2ef
+  metadata.gz: 778183427db0fcc75a8dd2a9365ad7a12824d7d1271333044896d130b58d371ae824c97e888fc2f125e0946beccd1d2bdc6f830238383321511b5a73774bd594
+  data.tar.gz: bb37c2acdac734795af2c6c1b7182fc97d07d46e74181b0d4257618b1e1b1318a054e5acbf53214cd7e971702d423d16e62674780f7772316ee1a3b1465f9422

data/README.md

@@ -165,8 +165,8 @@ atmos -e dev destroy
 
 # Destroys the bootstrap resources (state, secret, lock storage and
 # cross-account access role)
-TF_VAR_force_destroy_buckets=true atmos -e dev apply --group bootstrap
-atmos -e dev destroy --group bootstrap
+TF_VAR_force_destroy_buckets=true atmos -e dev -g bootstrap apply
+atmos -e dev -g bootstrap destroy
 
 # For normal usage you should rarely need to cleanup the ops account, but
 # included here in case you want to completely purge the atmos resources after
@@ -177,8 +177,8 @@ AWS_PROFILE=<root_profile_name> TF_VAR_force_destroy_buckets=true atmos -e ops a
 AWS_PROFILE=<root_profile_name> atmos -e ops destroy
 
 # Cleanup ops bootstrap
-AWS_PROFILE=<root_profile_name> TF_VAR_force_destroy_buckets=true atmos -e ops apply --group bootstrap
-AWS_PROFILE=<root_profile_name> atmos -e ops destroy --group bootstrap
+AWS_PROFILE=<root_profile_name> TF_VAR_force_destroy_buckets=true atmos -e ops -g bootstrap apply
+AWS_PROFILE=<root_profile_name> atmos -e ops -g bootstrap destroy
 
 ```
 

data/lib/simplygenius/atmos/cli.rb

@@ -40,6 +40,10 @@ module SimplyGenius
              'ENV', "The atmos environment\n",
              environment_variable: 'ATMOS_ENV', default: 'ops'
 
+      option ["-g", "--atmos-group"],
+             'GROUP', "The atmos working group\n for selecting recipe groups\n",
+             default: 'default'
+
       option ["-l", "--load-path"],
              "PATH", "adds additional paths to ruby load path",
              multivalued: true
@@ -99,7 +103,7 @@ module SimplyGenius
       def parse(arguments)
         super
         if Atmos.config.nil?
-          Atmos.config = Config.new(atmos_env)
+          Atmos.config = Config.new(atmos_env, atmos_group)
           log = Atmos.config.is_atmos_repo? && log? ? "atmos.log" : nil
           Logging.setup_logging(debug?, color?, log)
           UI.color_enabled = color?

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

@@ -12,7 +12,7 @@ module SimplyGenius
 
         def execute
           args = ["apply"]
-          args << "--get-modules" unless Atmos.config["disable_auto_modules"].to_s == "true"
+          args << "--get-modules" unless Atmos.config["atmos.terraform.disable_auto_modules"].to_s == "true"
           @terraform_arguments.insert(0, *args)
           super
         end

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

@@ -14,8 +14,10 @@ module SimplyGenius
                :flag, "forces bootstrap\n"
 
         def execute
+          orig_config = Atmos.config
+          Atmos.config = Config.new(Atmos.config.atmos_env, 'bootstrap')
 
-          tf_init_dir = File.join(Atmos.config.tf_working_dir('bootstrap'), '.terraform')
+          tf_init_dir = File.join(Atmos.config.tf_working_dir, '.terraform')
           tf_initialized = File.exist?(tf_init_dir)
           backend_initialized = File.exist?(File.join(tf_init_dir, 'terraform.tfstate'))
 
@@ -30,7 +32,7 @@ module SimplyGenius
 
           Atmos.config.provider.auth_manager.authenticate(ENV, bootstrap: true) do |auth_env|
             begin
-              exe = TerraformExecutor.new(process_env: auth_env, working_group: 'bootstrap')
+              exe = TerraformExecutor.new(process_env: auth_env)
 
               skip_backend = true
               skip_secrets = true
@@ -59,6 +61,7 @@ module SimplyGenius
 
               # Might as well init the non-bootstrap case as well once the state
               # storage has been setup in bootstrap
+              Atmos.config = orig_config
               exe = TerraformExecutor.new(process_env: auth_env)
               exe.run("init", "-input=false", skip_secrets: true)
 

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

@@ -57,7 +57,7 @@ module SimplyGenius
 
             # don't want to fail for new repo
             if  Atmos.config && Atmos.config.is_atmos_repo?
-              Atmos.config['template_sources'].try(:each) do |item|
+              Atmos.config['atmos.template_sources'].try(:each) do |item|
                 SourcePath.register(item.name, item.location)
               end
             end
@@ -141,7 +141,7 @@ module SimplyGenius
         end
 
         def state_file
-          @state_file ||= Atmos.config["generate.state_file"]
+          @state_file ||= Atmos.config["atmos.generate.state_file"]
         end
 
         def state

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

@@ -1,10 +1,13 @@
 require_relative 'terraform'
+require 'fileutils'
+require 'os'
 
 module SimplyGenius
   module Atmos
     module Commands
 
       class Init < Terraform
+        include FileUtils
 
         def self.description
           "Runs terraform init"
@@ -13,6 +16,18 @@ module SimplyGenius
         def execute
           @terraform_arguments.insert(0, "init")
           super
+
+          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
+          end
+
         end
 
       end

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

@@ -12,7 +12,7 @@ module SimplyGenius
 
         def execute
           args = ["plan"]
-          args << "--get-modules" unless Atmos.config["disable_auto_modules"].to_s == "true"
+          args << "--get-modules" unless Atmos.config["atmos.terraform.disable_auto_modules"].to_s == "true"
           @terraform_arguments.insert(0, *args)
           super
         end

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

@@ -28,19 +28,7 @@ module SimplyGenius
 
           Atmos.config.provider.auth_manager.authenticate(ENV) do |auth_env|
             begin
-
-              # TODO: hack to allow apply/etc for bootstrap group
-              # Fix this once we allow more extensive recipe grouping
-              working_group = 'default'
-              @terraform_arguments.each_with_index do |a, i|
-                if a == "--group"
-                  @terraform_arguments.delete_at(i)
-                  working_group = @terraform_arguments.delete_at(i)
-                  break
-                end
-              end
-
-              exe = TerraformExecutor.new(process_env: auth_env, working_group: working_group)
+              exe = TerraformExecutor.new(process_env: auth_env)
               get_modules = @terraform_arguments.delete("--get-modules")
               exe.run(*@terraform_arguments, get_modules: get_modules.present?)
             rescue TerraformExecutor::ProcessFailed => e

data/lib/simplygenius/atmos/config.rb

@@ -13,12 +13,14 @@ module SimplyGenius
       include GemLogger::LoggerSupport
       include FileUtils
 
-      attr_accessor :atmos_env, :root_dir,
+      attr_accessor :atmos_env, :working_group,
+                    :root_dir,
                     :config_file,
                     :tmp_root
 
-      def initialize(atmos_env)
+      def initialize(atmos_env, working_group = 'default')
         @atmos_env = atmos_env
+        @working_group = working_group
         @root_dir = File.expand_path(Dir.pwd)
         @config_file = File.join(root_dir, "config", "atmos.yml")
         @tmp_root = File.join(root_dir, "tmp")
@@ -45,7 +47,7 @@ module SimplyGenius
       end
 
       def plugin_manager
-        @plugin_manager ||= PluginManager.new(self[:plugins])
+        @plugin_manager ||= PluginManager.new(self["atmos.plugins"])
       end
 
       def all_env_names
@@ -80,10 +82,9 @@ module SimplyGenius
         end
       end
 
-      def tf_working_dir(group='default')
-        @tf_working_dir ||= {}
-        @tf_working_dir[group] ||= begin
-          dir = File.join(tmp_dir, 'tf', group)
+      def tf_working_dir
+        @tf_working_dir ||= begin
+          dir = File.join(tmp_dir, 'tf', working_group)
           logger.debug("Terraform working dir: #{dir}")
           mkdir_p(dir)
           dir
@@ -91,7 +92,7 @@ module SimplyGenius
       end
 
       def add_user_load_path(*paths)
-        load_path = paths + Array(self[:load_path])
+        load_path = paths + Array(self["atmos.load_path"])
         if load_path.present?
           load_path = load_path.collect { |path| File.expand_path(path) }
           logger.debug("Adding to load path: #{load_path.inspect}")
@@ -156,9 +157,14 @@ module SimplyGenius
 
           Dir[pattern].each do |f|
             logger.debug("Loading atmos config file: #{f}")
-            h = SettingsHash.new(YAML.load_file(f))
-            config = config_merge(config, h)
-            @included_configs << f
+            data = YAML.load_file(f)
+            if data == false
+              logger.debug("Skipping empty config file: #{f}")
+            else
+              h = SettingsHash.new(data)
+              config = config_merge(config, h)
+              @included_configs << f
+            end
           end
         end
 
@@ -170,9 +176,14 @@ module SimplyGenius
         submap_file = File.join(submap_dir, "#{name}.yml")
         if File.exist?(submap_file)
           logger.debug("Loading atmos #{group} config file: #{submap_file}")
-          h = SettingsHash.new({group => {name => YAML.load_file(submap_file)}})
-          config = config_merge(config, h)
-          @included_configs << submap_file
+          data  = YAML.load_file(submap_file)
+          if data == false
+            logger.debug("Skipping empty config file: #{submap_file}")
+          else
+            h = SettingsHash.new({group => {name => data}})
+            config = config_merge(config, h)
+            @included_configs << submap_file
+          end
         end
 
         begin
@@ -199,7 +210,7 @@ module SimplyGenius
             @included_configs << config_file
           end
 
-          @full_config = load_config_sources(File.dirname(config_file), @full_config, *Array(@full_config[:config_sources]))
+          @full_config = load_config_sources(File.dirname(config_file), @full_config, *Array(@full_config.notation_get("atmos.config_sources")))
 
           @full_config['provider'] = provider_name = @full_config['provider'] || 'aws'
 
@@ -209,6 +220,7 @@ module SimplyGenius
           global = SettingsHash.new(@full_config.reject {|k, v| ['providers', 'environments'].include?(k) })
           conf = config_merge(global, {
               atmos_env: atmos_env,
+              atmos_working_group: working_group,
               atmos_version: VERSION
           })
           expand(conf, conf)
@@ -273,6 +285,7 @@ module SimplyGenius
 
         return filename, line
       end
+
     end
 
   end

data/lib/simplygenius/atmos/ipc_actions/notify.rb

@@ -19,7 +19,7 @@ module SimplyGenius
               'success' => ''
           }
 
-          return result if Atmos.config["ipc.notify.disable"].to_s == "true"
+          return result if Atmos.config["atmos.ipc.notify.disable"].to_s == "true"
           return notify(**opts)
 
         end

data/lib/simplygenius/atmos/otp.rb

@@ -10,7 +10,7 @@ module SimplyGenius
       include GemLogger::LoggerSupport
 
       def initialize
-        @secret_file = Atmos.config["otp.secret_file"] || "~/.atmos.yml"
+        @secret_file = Atmos.config["atmos.otp.secret_file"] || "~/.atmos.yml"
         @secret_file = File.expand_path(@secret_file)
         yml_hash = YAML.load_file(@secret_file) rescue Hash.new
         @secret_store = SettingsHash.new(yml_hash)

data/lib/simplygenius/atmos/terraform_executor.rb

@@ -16,11 +16,9 @@ module SimplyGenius
 
       class ProcessFailed < RuntimeError; end
 
-      def initialize(process_env: ENV, working_group: 'default')
+      def initialize(process_env: ENV)
         @process_env = process_env
-        @working_group = working_group
-        @working_dir = Atmos.config.tf_working_dir(@working_group)
-        @recipes = Atmos.config["recipes.#{@working_group}"]
+        @recipes = Atmos.config["recipes.#{Atmos.config.working_group}"]
       end
 
       def run(*terraform_args, skip_backend: false, skip_secrets: false, get_modules: false, output_io: nil)
@@ -70,15 +68,15 @@ module SimplyGenius
 
             stdout_writer.sync = stderr_writer.sync = true
 
-            stdout_filters = Atmos.config.plugin_manager.output_filters(:stdout, {process_env: @process_env, working_group: @working_group})
-            stderr_filters = Atmos.config.plugin_manager.output_filters(:stderr, {process_env: @process_env, working_group: @working_group})
+            stdout_filters = Atmos.config.plugin_manager.output_filters(:stdout, {process_env: @process_env, working_group: Atmos.config.working_group})
+            stderr_filters = Atmos.config.plugin_manager.output_filters(:stderr, {process_env: @process_env, working_group: Atmos.config.working_group})
 
             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)
 
             ipc.listen do |sock_path|
 
-              if Atmos.config['ipc.disable']
+              if Atmos.config['atmos.ipc.disable']
                 # Using : as the command makes execution of ipc from the
                 # terraform side a no-op in both cases of how we call it.  This
                 # way, terraform execution continues to work when IPC is disabled
@@ -135,7 +133,6 @@ module SimplyGenius
 
       def setup_working_dir(skip_backend: false)
         clean_links
-        link_shared_plugin_dir
         link_support_dirs
         link_recipes
         write_atmos_vars
@@ -149,11 +146,6 @@ module SimplyGenius
         if backend_config.present? && ! skip_backend
           logger.debug("Writing out terraform state backend config")
 
-          # Use a different state file per group
-          if @working_group
-            backend_config['key'] = "#{@working_group}-#{backend_config['key']}"
-          end
-
           backend_type = backend_config.delete("type")
 
           backend = {
@@ -206,7 +198,7 @@ module SimplyGenius
 
       def tf_recipes_dir
         @tf_recipes_dir ||= begin
-          dir = File.join(@working_dir, 'recipes')
+          dir = File.join(Atmos.config.tf_working_dir, 'recipes')
           logger.debug("Tf recipes dir: #{dir}")
           mkdir_p(dir)
           dir
@@ -221,12 +213,11 @@ module SimplyGenius
           # 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
           #
-          atmos_config = homogenize_for_terraform(Atmos.config.to_h)
+          homogenized_config = homogenize_for_terraform(Atmos.config.to_h)
           var_hash = {
-              atmos_env: Atmos.config.atmos_env,
               all_env_names: Atmos.config.all_env_names,
               account_ids: Atmos.config.account_hash,
-              atmos_config: atmos_config
+              atmos_config: homogenized_config
           }
           var_hash = var_hash.merge(Atmos.config.to_h)
           f.puts(JSON.pretty_generate(var_hash))
@@ -246,7 +237,7 @@ module SimplyGenius
       end
 
       def clean_links
-        Find.find(@working_dir) do |f|
+        Find.find(Atmos.config.tf_working_dir) do |f|
           Find.prune if f =~ /\/.terraform\/modules\//
           File.delete(f) if File.symlink?(f)
         end
@@ -254,18 +245,7 @@ module SimplyGenius
 
       def link_support_dirs
         ['modules', 'templates'].each do |subdir|
-          ln_sf(File.join(Atmos.config.root_dir, subdir), @working_dir)
-        end
-      end
-
-      def link_shared_plugin_dir
-        if ! Atmos.config["terraform.disable_shared_plugins"]
-          shared_plugins_dir = File.join(Atmos.config.tmp_root, "terraform_plugins")
-          mkdir_p(shared_plugins_dir)
-          terraform_state_dir = File.join(tf_recipes_dir, '.terraform')
-          mkdir_p(terraform_state_dir)
-          terraform_plugins_dir = File.join(terraform_state_dir, 'plugins')
-          ln_sf(shared_plugins_dir, terraform_plugins_dir)
+          ln_sf(File.join(Atmos.config.root_dir, subdir), Atmos.config.tf_working_dir)
         end
       end
 

data/lib/simplygenius/atmos/ui.rb

@@ -99,13 +99,13 @@ module SimplyGenius
         message = message.to_s
         title = title.present? ? title.to_s : "Atmos Notification"
         modal = ["true", "1"].include?(modal.to_s)
-        modal = false if Atmos.config["ui.notify.disable_modal"]
+        modal = false if Atmos.config["atmos.ui.notify.disable_modal"]
 
-        return result if Atmos.config["ui.notify.disable"].to_s == "true"
+        return result if Atmos.config["atmos.ui.notify.disable"].to_s == "true"
 
-        force_inline = opts[:inline].to_s == "true" || Atmos.config["ui.notify.force_inline"].to_s == "true"
+        force_inline = opts[:inline].to_s == "true" || Atmos.config["atmos.ui.notify.force_inline"].to_s == "true"
 
-        command = Atmos.config["ui.notify.command"]
+        command = Atmos.config["atmos.ui.notify.command"]
 
         if command.present? && ! force_inline
 

data/lib/simplygenius/atmos/version.rb

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

data/templates/new/config/atmos/environments/dev.yml

@@ -0,0 +1,8 @@
+# Environment specific overrides for the dev environment
+#
+# You can add overrides for other environments by creating a <env>.yml file in
+# this directory where <env> is the environment name.
+#
+# Overrides in this file should NOT be scoped under a "environments ->
+# <env>" hash like they need to be in atmos.yml
+#

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

@@ -1,52 +1,74 @@
-# Optional configuration for controlling the behavior of the atmos runtime
+# Configuration for controlling the behavior of the atmos runtime
+atmos:
 
-# Sets a prefix on the root keys when passed into terraform as a var value
-var_prefix:
+  # Sources for atmos templates
+  # To circumvent the version lock and get the latest git master recipes, use the git
+  # location, e.g.:
+  # location: https://github.com/simplygenius/atmos-recipes.git
+  #
+  template_sources:
+  - name: atmos-recipes
+    location: https://github.com/simplygenius/atmos-recipes/archive/v#{atmos_version}.zip#atmos-recipes-#{atmos_version}
+  #- name: atmos-pro-recipes
+  #  location: https://YOUR_API_KEY@releases.simplygenius.com/recipes/v#{atmos_version}#atmos-pro-recipes-#{atmos_version}
 
-# Disable module fetch from convenience plan/apply commandss
-disable_auto_modules: false
+  # To get the atmos-pro gem, add the gem source like:
+  #   gem sources -a https://YOUR_API_KEY@releases.simplygenius.com/gems/
+  # then install the gem:
+  #   gem install simplygenius-atmos-pro
+  # then add simplygenius-atmos-pro to the plugins key below
+  #
+  # The list of plugin gems to load when running atmos
+  #
+  plugins:
+    #   - simplygenius-atmos-pro
 
-# Allows one to add a custom ruby load path list for extending atmos without
-# having to publish a gem
-load_path:
+  # Allows one to add a custom ruby load path list for extending atmos without
+  # having to publish a gem
+  load_path:
 
-# Configure the mechanism that allows terraform to callback into atmos
-ipc:
-  # Disables all IPC callbacks into atmos from terraform
-  disable: false
-  # Configures the notify IP callback
-  notify:
-    # Disable notify callbacks
+  # Configure the mechanism that allows terraform to callback into atmos
+  ipc:
+    # Disables all IPC callbacks into atmos from terraform
     disable: false
+    # Configures the notify IP callback
+    notify:
+      # Disable notify callbacks
+      disable: false
 
-# Configure the integrated otp mechanism
-otp:
-  # The file where otp secrets are stored
-  secret_file: ~/.atmos.yml
-
-# Configure the template generator
-generate:
-  # The file storing the record of each generated template
-  state_file: .atmos-templates.yml
-
-# Configure the UI components
-ui:
-  # Configures UI notifications
-  notify:
-    # Disable notifications
-    disable: false
-    # Force notifications to never be modal
-    disable_modal: false
-    # Set a custom command for notifications, embedded {{title|message|modal}}
-    # will be replaced with the value passed from terraform
-    command:
-    # Force notifications inline in atmos' stdout output rather than launching
-    # a GUI notification
-    force_inline: false
-
-# Configure terraform execution details
-terraform:
-  # By default, all terraform plugins are placed in a directory so they can be
-  # reused across all envs/groups.  This can be disabled here (you can also
-  # override using the terraform cli options for plugins)
-  disable_shared_plugins: false
+  # Configure the integrated otp mechanism
+  otp:
+    # The file where otp secrets are stored
+    secret_file: ~/.atmos.yml
+
+  # Configure the template generator
+  generate:
+    # The file storing the record of each generated template
+    state_file: .atmos-templates.yml
+
+  # Configure the UI components
+  ui:
+    # Configures UI notifications
+    notify:
+      # Disable notifications
+      disable: false
+      # Force notifications to never be modal
+      disable_modal: false
+      # Set a custom command for notifications, embedded {{title|message|modal}}
+      # will be replaced with the value passed from terraform
+      command:
+      # Force notifications inline in atmos' stdout output rather than launching
+      # a GUI notification
+      force_inline: false
+
+  # Configure terraform execution details
+  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
+    disable_shared_plugins: false

data/templates/new/config/atmos.yml

@@ -1,3 +1,24 @@
+# The atmos configuration system merges together all the yml files into one
+# giant hash, starting with this atmos.yml, then adding in all the files
+# matching the patterns in atmos.config_sources
+#
+# Hashes and arrays are merged in an additive fashion, and scalars are replaced
+# based on the merge order (last wins).  e.g.
+#   "foo: {bar: 1}, hum: [1]" + "foo: {baz: 2}, hum: [2]" => "foo: {bar: 1, baz: 2}, , hum: [1, 2]"
+# You can force an override (vs merge) of a hash or array by prefixing the key
+# with a caret (^)
+#   "foo: {bar: 1}" + "^foo: {baz: 2}" => "foo: {baz: 2}"
+#
+# Providers and environment overrides get merged in on top of the hash based on
+# the selected provider (aws) and environment (ops/dev/prod/etc).
+# The providers and environments key/hash are excluded from the final merged
+# configuration hash
+#
+# The merged configuration hash is provided to terraform at execution time via a
+# generated tfvars.json  To access those variables you still need to declare the
+# variables you use with a terraform variable declaration in a tf file
+#
+
 # The short name of your organization
 #
 org:
@@ -29,33 +50,14 @@ environments:
 # running in a development environment, for example:
 # {is_dev ? 'dev val' : 'prod val'}
 #
-is_dev: "#{ /dev|test|demo/.match?(atmos_env) }"
-
-# A list of glob patterns for finding atmos yml files
-# Patterns can be absolute (beginning with /), but if not are applied relative
-# to the directory containing atmos.yml
-#
-config_sources:
-  - atmos/*.y{,a}ml
-
-# Sources for atmos templates
-# To circumvent the version lock and get the latest git master recipes, use the git
-# location, e.g.:
-# location: https://github.com/simplygenius/atmos-recipes.git
-#
-template_sources:
-- name: atmos-recipes
-  location: https://github.com/simplygenius/atmos-recipes/archive/v#{atmos_version}.zip#atmos-recipes-#{atmos_version}
-#- name: atmos-pro-recipes
-#  location: https://YOUR_API_KEY@releases.simplygenius.com/recipes/v#{atmos_version}#atmos-pro-recipes-#{atmos_version}
-
-# To get the atmos-pro gem, add the gem source like:
-#   gem sources -a https://YOUR_API_KEY@releases.simplygenius.com/gems/
-# then install the gem:
-#   gem install simplygenius-atmos-pro
-# then add simplygenius-atmos-pro to the plugins key below
-#
-# The list of plugin gems to load when running atmos
-#
-plugins:
-#   - simplygenius-atmos-pro
+is_dev: "#{ !! /dev|test|demo/.match(atmos_env) }"
+
+# Configuration required in this file for finding other atmos config.  See
+# config/atmos/runtime.yml for atmos runtime configuration settings
+atmos:
+  # A list of glob patterns for finding atmos yml files
+  # Patterns can be absolute (beginning with /), but if not are applied relative
+  # to the directory containing atmos.yml
+  #
+  config_sources:
+    - atmos/*.y{,a}ml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,324 +126,324 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: gem_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: sigdump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.4
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.28.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-organizations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 description: Atmos provides a terraform scaffold for creating cloud system architectures
 email:
 - matt@simplygenius.com
@@ -503,6 +503,7 @@ files:
 - lib/simplygenius/atmos/utils.rb
 - lib/simplygenius/atmos/version.rb
 - templates/new/config/atmos.yml
+- templates/new/config/atmos/environments/dev.yml
 - templates/new/config/atmos/recipes.yml
 - templates/new/config/atmos/runtime.yml
 - templates/new/templates.yml