humidifier-reservoir 0.2.3 → 0.3.0

data/docs/method_list.html

@@ -118,16 +118,16 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/CLI.html#deploy-instance_method" title="Humidifier::Reservoir::CLI#deploy (method)">#deploy</a></span>
-      <small>Humidifier::Reservoir::CLI</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#deploy-instance_method" title="Humidifier::Reservoir::Stack#deploy (method)">#deploy</a></span>
+      <small>Humidifier::Reservoir::Stack</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#deploy-instance_method" title="Humidifier::Reservoir::Stack#deploy (method)">#deploy</a></span>
-      <small>Humidifier::Reservoir::Stack</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/CLI.html#deploy-instance_method" title="Humidifier::Reservoir::CLI#deploy (method)">#deploy</a></span>
+      <small>Humidifier::Reservoir::CLI</small>
     </div>
   </li>
   
@@ -166,29 +166,37 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#initialize-instance_method" title="Humidifier::Reservoir::Stack#initialize (method)">#initialize</a></span>
-      <small>Humidifier::Reservoir::Stack</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/ParameterList.html#from-class_method" title="Humidifier::Reservoir::ParameterList.from (method)">from</a></span>
+      <small>Humidifier::Reservoir::ParameterList</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/Mapping.html#initialize-instance_method" title="Humidifier::Reservoir::Mapping#initialize (method)">#initialize</a></span>
-      <small>Humidifier::Reservoir::Mapping</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/Config.html#initialize-instance_method" title="Humidifier::Reservoir::Config#initialize (method)">#initialize</a></span>
+      <small>Humidifier::Reservoir::Config</small>
     </div>
   </li>
   
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/Config.html#initialize-instance_method" title="Humidifier::Reservoir::Config#initialize (method)">#initialize</a></span>
-      <small>Humidifier::Reservoir::Config</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/Mapping.html#initialize-instance_method" title="Humidifier::Reservoir::Mapping#initialize (method)">#initialize</a></span>
+      <small>Humidifier::Reservoir::Mapping</small>
     </div>
   </li>
   
 
   <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#initialize-instance_method" title="Humidifier::Reservoir::Stack#initialize (method)">#initialize</a></span>
+      <small>Humidifier::Reservoir::Stack</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/Config.html#map-instance_method" title="Humidifier::Reservoir::Config#map (method)">#map</a></span>
       <small>Humidifier::Reservoir::Config</small>
@@ -196,7 +204,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/Mapping.html#mapper-instance_method" title="Humidifier::Reservoir::Mapping#mapper (method)">#mapper</a></span>
       <small>Humidifier::Reservoir::Mapping</small>
@@ -204,7 +212,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/Config.html#mapping_for-instance_method" title="Humidifier::Reservoir::Config#mapping_for (method)">#mapping_for</a></span>
       <small>Humidifier::Reservoir::Config</small>
@@ -212,7 +220,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir.html#mapping_for-class_method" title="Humidifier::Reservoir.mapping_for (method)">mapping_for</a></span>
       <small>Humidifier::Reservoir</small>
@@ -220,7 +228,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/Config.html#mappings-instance_method" title="Humidifier::Reservoir::Config#mappings (method)">#mappings</a></span>
       <small>Humidifier::Reservoir::Config</small>
@@ -228,6 +236,14 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack/Export.html#name-instance_method" title="Humidifier::Reservoir::Stack::Export#name (method)">#name</a></span>
+      <small>Humidifier::Reservoir::Stack::Export</small>
+    </div>
+  </li>
+  
+
   <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#name-instance_method" title="Humidifier::Reservoir::Stack#name (method)">#name</a></span>
@@ -238,8 +254,8 @@
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/Stack/Export.html#name-instance_method" title="Humidifier::Reservoir::Stack::Export#name (method)">#name</a></span>
-      <small>Humidifier::Reservoir::Stack::Export</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#parameters-instance_method" title="Humidifier::Reservoir::Stack#parameters (method)">#parameters</a></span>
+      <small>Humidifier::Reservoir::Stack</small>
     </div>
   </li>
   
@@ -262,16 +278,16 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/Mapping.html#resource_for-instance_method" title="Humidifier::Reservoir::Mapping#resource_for (method)">#resource_for</a></span>
-      <small>Humidifier::Reservoir::Mapping</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/BaseMapper.html#resource_for-instance_method" title="Humidifier::Reservoir::BaseMapper#resource_for (method)">#resource_for</a></span>
+      <small>Humidifier::Reservoir::BaseMapper</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/BaseMapper.html#resource_for-instance_method" title="Humidifier::Reservoir::BaseMapper#resource_for (method)">#resource_for</a></span>
-      <small>Humidifier::Reservoir::BaseMapper</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/Mapping.html#resource_for-instance_method" title="Humidifier::Reservoir::Mapping#resource_for (method)">#resource_for</a></span>
+      <small>Humidifier::Reservoir::Mapping</small>
     </div>
   </li>
   
@@ -342,16 +358,16 @@
 
   <li class="even ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#upload-instance_method" title="Humidifier::Reservoir::Stack#upload (method)">#upload</a></span>
-      <small>Humidifier::Reservoir::Stack</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/CLI.html#upload-instance_method" title="Humidifier::Reservoir::CLI#upload (method)">#upload</a></span>
+      <small>Humidifier::Reservoir::CLI</small>
     </div>
   </li>
   
 
   <li class="odd ">
     <div class="item">
-      <span class='object_link'><a href="Humidifier/Reservoir/CLI.html#upload-instance_method" title="Humidifier::Reservoir::CLI#upload (method)">#upload</a></span>
-      <small>Humidifier::Reservoir::CLI</small>
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#upload-instance_method" title="Humidifier::Reservoir::Stack#upload (method)">#upload</a></span>
+      <small>Humidifier::Reservoir::Stack</small>
     </div>
   </li>
   

data/docs/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec  5 14:49:51 2017 by
+  Generated on Tue Dec  5 18:38:21 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.12 (ruby-2.4.2).
 </div>

data/lib/humidifier/reservoir.rb

@@ -9,6 +9,7 @@ require 'humidifier/reservoir/cli'
 require 'humidifier/reservoir/config'
 require 'humidifier/reservoir/error'
 require 'humidifier/reservoir/mapping'
+require 'humidifier/reservoir/parameter_list'
 require 'humidifier/reservoir/stack'
 require 'humidifier/reservoir/version'
 

data/lib/humidifier/reservoir/cli.rb

@@ -21,18 +21,18 @@ module Humidifier
         end
       end
 
-      desc 'deploy [?stack]', 'Update one or all stacks'
+      desc 'deploy [?stack] [*parameters]', 'Update one or all stacks'
       option :wait, desc: 'Wait for the stack to create/update',
                     type: :boolean, default: false
       option :prefix, desc: 'The prefix to use for the stack'
-      def deploy(name = nil)
+      def deploy(name = nil, *parameters)
         stack_names = stack_names_from(name)
         authorize
 
         stack_names.each do |stack_name|
           stack = Stack.new(stack_name, prefix: options[:prefix])
           puts "Deploying #{stack.stack_name}"
-          stack.deploy(options[:wait])
+          stack.deploy(options[:wait], parameters_from(parameters))
         end
       end
 
@@ -76,6 +76,13 @@ module Humidifier
             Aws::SharedCredentials.new(profile_name: options[:aws_profile])
         end
 
+        def parameters_from(opts)
+          opts.map do |opt|
+            key, value = opt.split('=')
+            { parameter_key: key, parameter_value: value }
+          end
+        end
+
         def safe_execute
           yield
         rescue Error => error

data/lib/humidifier/reservoir/parameter_list.rb

@@ -0,0 +1,16 @@
+module Humidifier
+  module Reservoir
+    # The list of parameters for a given stack parsed from the given filepath.
+    module ParameterList
+      def self.from(filepath)
+        loaded = YAML.load_file(filepath)
+        return {} unless loaded
+
+        loaded.each_with_object({}) do |(name, opts), params|
+          opts = opts.map { |key, value| [key.to_sym, value] }.to_h
+          params[name] = Parameter.new(opts)
+        end
+      end
+    end
+  end
+end

data/lib/humidifier/reservoir/stack.rb

@@ -3,7 +3,7 @@ module Humidifier
     # Represents a CloudFormation stack. This contains all of the logic for
     # interfacing with humidifier to deploy stacks, validate them, and display
     # them.
-    class Stack
+    class Stack # rubocop:disable Metrics/ClassLength
       # Represents an exported resource in a stack for use in cross-stack
       # references.
       Export =
@@ -27,24 +27,42 @@ module Humidifier
       end
 
       def create_change_set
-        return unless ensure_resources
-        valid?
+        return if !ensure_resources('change') || !valid?
 
         opts = { capabilities: %w[CAPABILITY_IAM CAPABILITY_NAMED_IAM] }
         humidifier_stack.create_change_set(opts)
       end
 
-      def deploy(wait = false)
-        return unless ensure_resources
-        valid?
+      def deploy(wait = false, parameter_values = {})
+        return if !ensure_resources('deploy') || !valid?
 
-        opts = { capabilities: %w[CAPABILITY_IAM CAPABILITY_NAMED_IAM] }
+        opts = {
+          capabilities: %w[CAPABILITY_IAM CAPABILITY_NAMED_IAM],
+          parameters: parameter_values
+        }
         humidifier_stack.public_send(wait ? :deploy_and_wait : :deploy, opts)
       end
 
+      def parameters
+        @parameters ||=
+          begin
+            parameter_filepath =
+              Reservoir.files_for(name).detect do |filepath|
+                File.basename(filepath, '.yml') == 'parameters'
+              end
+
+            parameter_filepath ? ParameterList.from(parameter_filepath) : {}
+          end
+      end
+
       def resources
         Reservoir.files_for(name).each_with_object({}) do |filepath, resources|
-          resources.merge!(parse(filepath, File.basename(filepath, '.yml')))
+          basename = File.basename(filepath, '.yml')
+
+          # Explicitly skip past parameters so we can pull them out later
+          next if basename == 'parameters'
+
+          resources.merge!(parse(filepath, basename))
         end
       end
 
@@ -57,6 +75,7 @@ module Humidifier
       end
 
       def upload
+        return if !ensure_resources('upload') || !valid?
         humidifier_stack.upload
       end
 
@@ -72,9 +91,9 @@ module Humidifier
 
       private
 
-      def ensure_resources
+      def ensure_resources(action = 'deploy')
         return true if humidifier_stack.resources.any?
-        puts "Refusing to deploy stack #{humidifier_stack.name} with no " \
+        puts "Refusing to #{action} stack #{humidifier_stack.name} with no " \
              'resources'
         false
       end
@@ -84,7 +103,8 @@ module Humidifier
           name: stack_name,
           description: "Resources for #{stack_name}",
           resources: resources,
-          outputs: outputs
+          outputs: outputs,
+          parameters: parameters
         )
       end
 

data/lib/humidifier/reservoir/version.rb

@@ -1,6 +1,6 @@
 module Humidifier
   module Reservoir
     # The current version.
-    VERSION = '0.2.3'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humidifier-reservoir
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Localytics
@@ -192,6 +192,7 @@ files:
 - docs/Humidifier/Reservoir/Config.html
 - docs/Humidifier/Reservoir/Error.html
 - docs/Humidifier/Reservoir/Mapping.html
+- docs/Humidifier/Reservoir/ParameterList.html
 - docs/Humidifier/Reservoir/Stack.html
 - docs/Humidifier/Reservoir/Stack/Export.html
 - docs/_index.html
@@ -216,6 +217,7 @@ files:
 - lib/humidifier/reservoir/config.rb
 - lib/humidifier/reservoir/error.rb
 - lib/humidifier/reservoir/mapping.rb
+- lib/humidifier/reservoir/parameter_list.rb
 - lib/humidifier/reservoir/stack.rb
 - lib/humidifier/reservoir/version.rb
 homepage: https://github.com/localytics/humidifier-reservoir