humidifier-reservoir 0.1.0 → 0.2.0

data/docs/index.html

@@ -215,6 +215,125 @@ if you&#39;re deploying from an instance. For more information, see the <a
 href="http://docs.aws.amazon.com/sdkforruby/api/">AWS docs</a> under the
 “Configuration” section.</p>
 
+<h4 id="label--prefix">–prefix</h4>
+
+<p>The <code>deploy</code> command also allows a <code>--prefix</code> command
+line argument that will override the default prefix (if one is configured)
+for the stack that is being deployed. This is especially useful when
+you&#39;re deploying multiple copies of the same stack (for instance,
+multiple autoscaling groups) that have different purposes or semantically
+mean newer versions of resources.</p>
+
+<h3 id="label-Shortcuts">Shortcuts</h3>
+
+<p>A couple of convenient shortcuts are built into
+<code>humidifier-reservoir</code> so that writing templates and mappers
+both can be more concise.</p>
+
+<h4 id="label-Automatic+id+properties">Automatic id properties</h4>
+
+<p>There are a lot of properties in the AWS CloudFormation resource
+specification that are simply pointers to other entities within the AWS
+ecosystem. For example, an <code>AWS::EC2::VPCGatewayAttachment</code>
+entity has a <code>VpcId</code> property that represents the ID of the
+associated <code>AWS::EC2::VPC</code>.</p>
+
+<p>Because this pattern is so common, <code>humidifier-reservoir</code>
+detects all properties ending in <code>Id</code> and allows you to specify
+them without the suffix. If you choose to use this format,
+<code>humidifier-reservoir</code> will automatically turn that value into a
+<a
+href="http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-ref.html">CloudFormation
+resource reference</a>.</p>
+
+<h4 id="label-Anonymous+mappers">Anonymous mappers</h4>
+
+<p>A lot of the time, mappers that you create will not be overly complicated,
+especially if you&#39;re using the aforementioned automatic id properties.
+Therefore, the <code>config.map</code> method takes a block, and allows you
+to specify the mapper inline. This is recommended for mappers that
+aren&#39;t too complicates as to warrant their own class (for instance, for
+testing purposes). An example of this using the <code>UserMapper</code>
+from above is below:</p>
+
+<pre class="code ruby"><code class="ruby"><span class='const'><span class='object_link'><a href="Humidifier.html" title="Humidifier (module)">Humidifier</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Humidifier/Reservoir.html" title="Humidifier::Reservoir (module)">Reservoir</a></span></span><span class='period'>.</span><span class='id identifier rubyid_configure'><span class='object_link'><a href="Humidifier/Reservoir.html#configure-class_method" title="Humidifier::Reservoir.configure (method)">configure</a></span></span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_config'>config</span><span class='op'>|</span>
+  <span class='id identifier rubyid_config'>config</span><span class='period'>.</span><span class='id identifier rubyid_map'>map</span> <span class='symbol'>:users</span><span class='comma'>,</span> <span class='label'>to:</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>AWS::IAM::User</span><span class='tstring_end'>&#39;</span></span> <span class='kw'>do</span>
+    <span class='const'>GROUPS</span> <span class='op'>=</span> <span class='lbrace'>{</span>
+      <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>eng</span><span class='tstring_end'>&#39;</span></span> <span class='op'>=&gt;</span> <span class='qwords_beg'>%w[</span><span class='tstring_content'>Engineering</span><span class='words_sep'> </span><span class='tstring_content'>Testing</span><span class='words_sep'> </span><span class='tstring_content'>Deployment</span><span class='words_sep'>]</span><span class='comma'>,</span>
+      <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>admin</span><span class='tstring_end'>&#39;</span></span> <span class='op'>=&gt;</span> <span class='qwords_beg'>%w[</span><span class='tstring_content'>Management</span><span class='words_sep'> </span><span class='tstring_content'>Administration</span><span class='words_sep'>]</span>
+    <span class='rbrace'>}</span>
+
+    <span class='id identifier rubyid_defaults'>defaults</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_logical_name'>logical_name</span><span class='op'>|</span>
+      <span class='lbrace'>{</span> <span class='label'>path:</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>/reservoir/</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span> <span class='label'>user_name:</span> <span class='id identifier rubyid_logical_name'>logical_name</span> <span class='rbrace'>}</span>
+    <span class='kw'>end</span>
+
+    <span class='id identifier rubyid_attribute'>attribute</span> <span class='symbol'>:group</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_group'>group</span><span class='op'>|</span>
+      <span class='id identifier rubyid_groups'>groups</span> <span class='op'>=</span> <span class='const'>GROUPS</span><span class='lbracket'>[</span><span class='id identifier rubyid_group'>group</span><span class='rbracket'>]</span>
+      <span class='id identifier rubyid_groups'>groups</span><span class='period'>.</span><span class='id identifier rubyid_any?'>any?</span> <span class='op'>?</span> <span class='lbrace'>{</span> <span class='label'>groups:</span> <span class='const'>GROUPS</span><span class='lbracket'>[</span><span class='id identifier rubyid_group'>group</span><span class='rbracket'>]</span> <span class='rbrace'>}</span> <span class='op'>:</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
+    <span class='kw'>end</span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span>
+</code></pre>
+
+<h4 id="label-Cross-stack+references">Cross-stack references</h4>
+
+<p>AWS allows cross-stack references through the <a
+href="http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-importvalue.html">intrinsic
+Fn::ImportValue function</a>. You can take advantage of this with
+<code>humidifier-reservoir</code> by using the <code>export: true</code>
+option on resources in your stacks. For instance, if in one stack you have
+a subnet that you need to reference in another, you could
+(<code>stacks/vpc/subnets.yml</code>):</p>
+
+<pre class="code ruby"><code class="ruby">ProductionPrivateSubnet2a:
+  vpc: ProductionVPC
+  cidr_block: 10.0.0.0/19
+  availability_zone: us-west-2a
+  export: true
+
+ProductionPrivateSubnet2b:
+  vpc: ProductionVPC
+  cidr_block: 10.0.64.0/19
+  availability_zone: us-west-2b
+  export: true
+
+ProductionPrivateSubnet2c:
+  vpc: ProductionVPC
+  cidr_block: 10.0.128.0/19
+  availability_zone: us-west-2c
+  export: true</code></pre>
+
+<p>And then in another stack, you could reference those values
+(<code>stacks/rds/db_subnets_groups.yml</code>):</p>
+
+<pre class="code ruby"><code class="ruby">ProductionDBSubnetGroup:
+  db_subnet_group_description: Production DB private subnet group
+  subnets:
+  - ProductionPrivateSubnet2a
+  - ProductionPrivateSubnet2b
+  - ProductionPrivateSubnet2c</code></pre>
+
+<p>Within the configuration, you would specify to use the
+<code>Fn::ImportValue</code> function like so:</p>
+
+<pre class="code ruby"><code class="ruby"><span class='const'><span class='object_link'><a href="Humidifier.html" title="Humidifier (module)">Humidifier</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Humidifier/Reservoir.html" title="Humidifier::Reservoir (module)">Reservoir</a></span></span><span class='period'>.</span><span class='id identifier rubyid_configure'><span class='object_link'><a href="Humidifier/Reservoir.html#configure-class_method" title="Humidifier::Reservoir.configure (method)">configure</a></span></span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_config'>config</span><span class='op'>|</span>
+  <span class='id identifier rubyid_config'>config</span><span class='period'>.</span><span class='id identifier rubyid_stack_path'>stack_path</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>stacks</span><span class='tstring_end'>&#39;</span></span>
+
+  <span class='id identifier rubyid_config'>config</span><span class='period'>.</span><span class='id identifier rubyid_map'>map</span> <span class='symbol'>:subnets</span><span class='comma'>,</span> <span class='label'>to:</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>EC2::Subnet</span><span class='tstring_end'>&#39;</span></span>
+
+  <span class='id identifier rubyid_config'>config</span><span class='period'>.</span><span class='id identifier rubyid_map'>map</span> <span class='symbol'>:db_subnet_groups</span><span class='comma'>,</span> <span class='label'>to:</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>RDS::DBSubnetGroup</span><span class='tstring_end'>&#39;</span></span> <span class='kw'>do</span>
+    <span class='id identifier rubyid_attribute'>attribute</span> <span class='symbol'>:subnets</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_subnet_names'>subnet_names</span><span class='op'>|</span>
+      <span class='id identifier rubyid_subnet_ids'>subnet_ids</span> <span class='op'>=</span>
+        <span class='id identifier rubyid_subnet_names'>subnet_names</span><span class='period'>.</span><span class='id identifier rubyid_map'>map</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_subnet_name'>subnet_name</span><span class='op'>|</span>
+          <span class='const'><span class='object_link'><a href="Humidifier.html" title="Humidifier (module)">Humidifier</a></span></span><span class='period'>.</span><span class='id identifier rubyid_fn'>fn</span><span class='period'>.</span><span class='id identifier rubyid_import_value'>import_value</span><span class='lparen'>(</span><span class='id identifier rubyid_subnet_name'>subnet_name</span><span class='rparen'>)</span>
+        <span class='kw'>end</span>
+
+      <span class='lbrace'>{</span> <span class='label'>subnet_ids:</span> <span class='id identifier rubyid_subnet_ids'>subnet_ids</span> <span class='rbrace'>}</span>
+    <span class='kw'>end</span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span>
+</code></pre>
+
 <h2 id="label-Development">Development</h2>
 
 <p>After checking out the repo, run <code>bin/setup</code> to install
@@ -241,9 +360,9 @@ href="http://opensource.org/licenses/MIT">MIT License</a>.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Sun Oct  1 09:25:22 2017 by
+  Generated on Wed Nov  8 13:26:15 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.9 (ruby-2.4.1).
+  0.9.9 (ruby-2.4.2).
 </div>
 
     </div>

data/docs/method_list.html

@@ -45,6 +45,14 @@
         
 
   <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack/Export.html#attribute-instance_method" title="Humidifier::Reservoir::Stack::Export#attribute (method)">#attribute</a></span>
+      <small>Humidifier::Reservoir::Stack::Export</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/BaseMapper.html#attribute-class_method" title="Humidifier::Reservoir::BaseMapper.attribute (method)">attribute</a></span>
       <small>Humidifier::Reservoir::BaseMapper</small>
@@ -52,7 +60,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/BaseMapper.html#attribute_methods-class_method" title="Humidifier::Reservoir::BaseMapper.attribute_methods (method)">attribute_methods</a></span>
       <small>Humidifier::Reservoir::BaseMapper</small>
@@ -60,6 +68,14 @@
   </li>
   
 
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Humidifier/Reservoir/CLI.html#change-instance_method" title="Humidifier::Reservoir::CLI#change (method)">#change</a></span>
+      <small>Humidifier::Reservoir::CLI</small>
+    </div>
+  </li>
+  
+
   <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/Mapping.html#clazz-instance_method" title="Humidifier::Reservoir::Mapping#clazz (method)">#clazz</a></span>
@@ -85,6 +101,14 @@
   
 
   <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#create_change_set-instance_method" title="Humidifier::Reservoir::Stack#create_change_set (method)">#create_change_set</a></span>
+      <small>Humidifier::Reservoir::Stack</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/BaseMapper.html#defaults-class_method" title="Humidifier::Reservoir::BaseMapper.defaults (method)">defaults</a></span>
       <small>Humidifier::Reservoir::BaseMapper</small>
@@ -92,7 +116,7 @@
   </li>
   
 
-  <li class="odd ">
+  <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>
@@ -100,7 +124,7 @@
   </li>
   
 
-  <li class="even ">
+  <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>
@@ -108,7 +132,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Humidifier/Reservoir/CLI.html#display-instance_method" title="Humidifier::Reservoir::CLI#display (method)">#display</a></span>
       <small>Humidifier::Reservoir::CLI</small>
@@ -116,6 +140,14 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#exports-instance_method" title="Humidifier::Reservoir::Stack#exports (method)">#exports</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#files_for-instance_method" title="Humidifier::Reservoir::Config#files_for (method)">#files_for</a></span>
@@ -205,6 +237,14 @@
   
 
   <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#pattern-instance_method" title="Humidifier::Reservoir::Stack#pattern (method)">#pattern</a></span>
       <small>Humidifier::Reservoir::Stack</small>
@@ -212,6 +252,14 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Humidifier/Reservoir/Stack.html#prefix-instance_method" title="Humidifier::Reservoir::Stack#prefix (method)">#prefix</a></span>
+      <small>Humidifier::Reservoir::Stack</small>
+    </div>
+  </li>
+  
+
   <li class="even ">
     <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>

data/docs/top-level-namespace.html

@@ -100,9 +100,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sun Oct  1 09:25:22 2017 by
+  Generated on Wed Nov  8 13:26:15 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.9 (ruby-2.4.1).
+  0.9.9 (ruby-2.4.2).
 </div>
 
     </div>

data/humidifier-reservoir.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'humidifier/reservoir/version'
@@ -28,7 +26,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
 
   spec.add_dependency 'aws-sdk-cloudformation', '~> 1.2'
   spec.add_dependency 'aws-sdk-s3', '~> 1.4'
-  spec.add_dependency 'humidifier', '~> 1.7', '>= 1.7'
+  spec.add_dependency 'humidifier', '~> 1.8', '>= 1.7'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'thor-hollaback', '~> 0.1'
 

data/lib/humidifier/reservoir/base_mapper.rb

@@ -6,6 +6,10 @@ module Humidifier
     # class provides an easy-to-extend DSL that allows for default attributes
     # specifying custom attributes.
     class BaseMapper
+      # The list of attributes that are common to all resources that need to be
+      # handles separately.
+      COMMON_ATTRIBUTES = Resource::COMMON_ATTRIBUTES.values
+
       class << self
         # Defines a custom attribute. The given block will receive the
         # user-provided value for the attribute. The block should return a hash
@@ -47,17 +51,36 @@ module Humidifier
       # the logical name for the resource, and the user-specified attributes.
       def resource_for(clazz, name, attributes)
         mapped = respond_to?(:attribute_defaults) ? attribute_defaults(name) : {}
-        attributes.each { |key, value| mapped.merge!(mapped_from(clazz, key, value)) }
-        clazz.new(mapped)
+
+        attributes.each do |key, value|
+          mapped.merge!(mapped_from(clazz, key, value))
+        end
+
+        common_attributes = common_attributes_from(mapped)
+
+        resource = clazz.new(mapped)
+        resource.update_attributes(common_attributes)
+        resource
       end
 
       private
 
-      def mapped_from(clazz, key, value)
+      def common_attributes_from(mapped)
+        COMMON_ATTRIBUTES.each_with_object({}) do |common_attribute, extract|
+          extracted = mapped.delete(common_attribute)
+          extract[common_attribute] = extracted if extracted
+        end
+      end
+
+      def mapped_from(clazz, key, value) # rubocop:disable Metrics/MethodLength
         if self.class.attribute_methods.include?(key.to_sym)
           public_send(:"attribute_#{key}", value)
         elsif clazz.prop?(key)
           { key.to_sym => value }
+        elsif clazz.prop?("#{key}_id")
+          { :"#{key}_id" => Humidifier.ref(value) }
+        elsif COMMON_ATTRIBUTES.include?(key.to_sym)
+          { key.to_sym => value }
         else
           raise Error, "Invalid attribute: #{key}"
         end

data/lib/humidifier/reservoir/cli.rb

@@ -8,14 +8,27 @@ module Humidifier
       class_option :debug, desc: 'Sets up debug mode', aliases: ['-d']
       class_around :safe_execute
 
+      desc 'change [?stack]', 'Create changesets for one or all stacks'
+      def change(name = nil)
+        stack_names = stack_names_from(name)
+        authorize
+
+        stack_names.each do |stack_name|
+          stack = Stack.new(stack_name)
+          puts "Creating a changeset for #{stack.stack_name}"
+          stack.create_change_set
+        end
+      end
+
       desc 'deploy [?stack]', '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)
-        stack_names = name ? [name] : Reservoir.stacks
+        stack_names = stack_names_from(name)
         authorize
 
         stack_names.each do |stack_name|
-          stack = Stack.new(stack_name)
+          stack = Stack.new(stack_name, prefix: options[:prefix])
           puts "Deploying #{stack.stack_name}"
           stack.deploy(options[:wait])
         end
@@ -23,12 +36,12 @@ module Humidifier
 
       desc 'display [stack] [?pattern]', 'Display the CloudFormation JSON for a given stack'
       def display(name, pattern = nil)
-        puts Stack.new(name, pattern && /#{pattern}/i).to_cf
+        puts Stack.new(name, pattern: pattern && /#{pattern}/i).to_cf
       end
 
       desc 'validate [?stack]', 'Validate that one or all stacks are valid with CloudFormation'
       def validate(name = nil)
-        stack_names = name ? [name] : Reservoir.stacks
+        stack_names = stack_names_from(name)
         authorize
 
         print 'Validating... '
@@ -48,6 +61,10 @@ module Humidifier
           puts error.message
           exit 1
         end
+
+        def stack_names_from(name)
+          name ? [name] : Reservoir.stacks
+        end
       end
     end
   end

data/lib/humidifier/reservoir/config.rb

@@ -14,8 +14,8 @@ module Humidifier
         Dir["#{stack_path}/#{name}/*.yml"]
       end
 
-      def map(type, opts = {})
-        mappings[type.to_sym] = Mapping.new(opts)
+      def map(type, opts = {}, &block)
+        mappings[type.to_sym] = Mapping.new(opts, &block)
       end
 
       def mapping_for(type)

data/lib/humidifier/reservoir/mapping.rb

@@ -6,16 +6,36 @@ module Humidifier
     class Mapping
       attr_reader :clazz, :mapper
 
-      def initialize(opts = {})
-        @clazz = Humidifier[opts[:to]]
+      def initialize(opts = {}, &block)
+        @clazz = Humidifier[normalized(opts[:to])]
         raise Error, "Invalid resource: #{opts[:to].inspect}" if @clazz.nil?
 
-        @mapper = opts.fetch(:using, BaseMapper).new
+        if opts[:using] && block_given?
+          raise Error, 'Cannot specify :using and provide an anonymous mapper'
+        end
+
+        @mapper = mapper_from(opts, &block)
       end
 
       def resource_for(name, attributes)
         mapper.resource_for(clazz, name, attributes)
       end
+
+      private
+
+      def mapper_from(opts, &block)
+        if opts[:using]
+          opts[:using].new
+        elsif block_given?
+          Class.new(BaseMapper, &block).new
+        else
+          BaseMapper.new
+        end
+      end
+
+      def normalized(to)
+        to.start_with?('AWS') ? to : "AWS::#{to}"
+      end
     end
   end
 end

data/lib/humidifier/reservoir/stack.rb

@@ -4,18 +4,38 @@ module Humidifier
     # interfacing with humidifier to deploy stacks, validate them, and display
     # them.
     class Stack
-      attr_reader :name, :pattern
+      # Represents an exported resource in a stack for use in cross-stack
+      # references.
+      Export =
+        Struct.new(:name, :attribute) do
+          def value
+            if attribute.is_a?(String)
+              Humidifier.fn.get_att([name, attribute])
+            else
+              Humidifier.ref(name)
+            end
+          end
+        end
+
+      attr_reader :name, :pattern, :prefix, :exports
 
-      def initialize(name, pattern = nil)
+      def initialize(name, pattern: nil, prefix: nil)
         @name    = name
         @pattern = pattern
+        @prefix  = prefix
+        @exports = []
+      end
+
+      def create_change_set
+        return unless ensure_resources
+        valid?
+
+        opts = { capabilities: %w[CAPABILITY_IAM CAPABILITY_NAMED_IAM] }
+        humidifier_stack.create_change_set(opts)
       end
 
       def deploy(wait = false)
-        if humidifier_stack.resources.empty?
-          puts "Refusing to deploy stack #{humidifier_stack.name} with no resources"
-          return
-        end
+        return unless ensure_resources
         valid?
 
         opts = { capabilities: %w[CAPABILITY_IAM CAPABILITY_NAMED_IAM] }
@@ -29,7 +49,7 @@ module Humidifier
       end
 
       def stack_name
-        @stack_name ||= "#{Reservoir.stack_prefix}#{name}"
+        @stack_name ||= "#{prefix || Reservoir.stack_prefix}#{name}"
       end
 
       def to_cf
@@ -47,14 +67,31 @@ MSG
 
       private
 
+      def ensure_resources
+        return true if humidifier_stack.resources.any?
+        puts "Refusing to deploy stack #{humidifier_stack.name} with no resources"
+        false
+      end
+
       def humidifier_stack
         Humidifier::Stack.new(
           name: stack_name,
           description: "Resources for #{stack_name}",
-          resources: resources
+          resources: resources,
+          outputs: outputs
         )
       end
 
+      def outputs
+        exports.each_with_object({}) do |export, exported|
+          exported[export.name] =
+            Humidifier::Output.new(
+              value: export.value,
+              export_name: export.name
+            )
+        end
+      end
+
       def parse(filepath, type)
         mapping = Reservoir.mapping_for(type)
         return {} if mapping.nil?
@@ -64,6 +101,10 @@ MSG
 
         loaded.each_with_object({}) do |(name, attributes), resources|
           next if pattern && name !~ pattern
+
+          attribute = attributes.delete('export')
+          exports << Export.new(name, attribute) if attribute
+
           resources[name] = mapping.resource_for(name, attributes)
         end
       end