stackup 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70cf1deee1c8dc53041f2d6ff6cb31fdc9dac4f7
-  data.tar.gz: 54fad33244ba8fe2c0935a95efed3ca897feb65b
+  metadata.gz: cac6ceefeefc19f6eea4ed171ddf4d596c75c778
+  data.tar.gz: df26370ed8fbe55624757667df93914105c8f8ad
 SHA512:
-  metadata.gz: 8c250dadcf6d56e74423b0c191bd21c52e2790a0c7f73c15f2c506c4213be26582033642b7dadc6979cf62f2e41653cfd31e66e48c442942eccb6352fd410553
-  data.tar.gz: cbc82bd3c82c85795636cd0e1e2febc30bc9ee307427f9b7f5c6cb1d51e633e7eb43335878061c686a8380f949314ffc8bcca316f58718b53b1f9c08c5151f9a
+  metadata.gz: 5f87618bdf6e7cd1869d5aaf9893a5e69d7605bfac22039c0e4ebfddb0d0dadf1c03f496071d771cf7819e289364401f5360d52ec52974799424914493252fa4
+  data.tar.gz: e9202e049b65f39bec6a51f8365fd1590e53a81464049404cb0f7a90c8477a19346c21036903c03a5fb8d4d550bb425ffee41693524c9025c40e9cd60d232b1f

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 1.0.1 (2016-12-07)
+
+* Fix handling of "!GetAtt" in CloudFormation YAML.
+* Special-case "!GetAZs" without an argument.
+* Add Stack#template_body.
+
 ## 1.0.0 (2016-10-07)
 
 * Add support for CloudFormation YAML extensions (e.g. `!Ref`).

data/lib/stackup/stack.rb

@@ -4,6 +4,7 @@ require "multi_json"
 require "stackup/error_handling"
 require "stackup/parameters"
 require "stackup/stack_watcher"
+require "stackup/yaml"
 
 module Stackup
 
@@ -99,7 +100,7 @@ module Stackup
     # @option options [Hash] :template
     #   stack template, as Ruby data
     # @option options [String] :template_body
-    #   stack template, as JSON
+    #   stack template, as JSON or YAML
     # @option options [String] :template_url
     #   location of stack template
     # @option options [Integer] :timeout_in_minutes
@@ -139,8 +140,6 @@ module Stackup
 
     # Delete the stack.
     #
-    # @param [String] template template JSON
-    # @param [Array<Hash>] parameters template parameters
     # @return [Symbol] +:deleted+ if successful
     # @raise [Stackup::StackUpdateError] if operation fails
     #
@@ -184,16 +183,24 @@ module Stackup
       end
     end
 
+    # Get the current template body.
+    #
+    # @return [String] current stack template, as JSON or YAML
+    # @raise [Stackup::NoSuchStack] if the stack doesn't exist
+    #
+    def template_body
+      handling_validation_error do
+        cf_client.get_template(:stack_name => name).template_body
+      end
+    end
+
     # Get the current template.
     #
     # @return [Hash] current stack template, as Ruby data
     # @raise [Stackup::NoSuchStack] if the stack doesn't exist
     #
     def template
-      handling_validation_error do
-        template_json = cf_client.get_template(:stack_name => name).template_body
-        MultiJson.load(template_json)
-      end
+      Stackup::YAML.load(template_body)
     end
 
     # Get the current parameters.

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
 end

data/lib/stackup/yaml.rb

@@ -47,6 +47,10 @@ module Stackup
         case target.tag
         when "!Ref"
           { "Ref" => super }
+        when "!GetAtt"
+          { "Fn::GetAtt" => super.split(".") }
+        when "!GetAZs"
+          { "Fn::GetAZs" => (super || "") }
         when /^!(\w+)$/
           { "Fn::#{$1}" => super }
         else

data/spec/stackup/yaml_spec.rb

@@ -10,7 +10,7 @@ describe Stackup::YAML do
       described_class.load(input)
     end
 
-    context "with plain YAML" do
+    describe "plain YAML" do
 
       let(:input) do
         <<-YAML
@@ -29,7 +29,7 @@ describe Stackup::YAML do
 
     end
 
-    context "with a !Ref" do
+    describe "!Ref" do
 
       let(:input) do
         <<-YAML
@@ -50,16 +50,16 @@ describe Stackup::YAML do
 
     end
 
-    context "with a !Ref" do
+    describe "!GetAtt" do
 
       let(:input) do
         <<-YAML
         Outputs:
-          Foo: !GetAtt ["Bar", "Baz"]
+          Foo: !GetAtt Bar.Baz
         YAML
       end
 
-      it "expands to Ref" do
+      it "expands to Fn::GetAtt" do
         expect(data).to eql(
           "Outputs" => {
             "Foo" => {
@@ -74,6 +74,77 @@ describe Stackup::YAML do
 
     end
 
+    describe "!GetAtt" do
+
+      context "with an argument" do
+
+        let(:input) do
+          <<-YAML
+            Foo:
+              !GetAZs xy-foobar-6
+          YAML
+        end
+
+        it "expands to Fn::GetAtt" do
+          expect(data).to eql(
+            "Foo" => {
+              "Fn::GetAZs" => "xy-foobar-6"
+            }
+          )
+        end
+
+      end
+
+      context "without an argument" do
+
+        let(:input) do
+          <<-YAML
+            Foo:
+              !GetAZs
+          YAML
+        end
+
+        it "infers a blank argument" do
+          expect(data).to eql(
+            "Foo" => {
+              "Fn::GetAZs" => ""
+            }
+          )
+        end
+
+      end
+
+    end
+
+    describe "!Whatever" do
+
+      let(:input) do
+        <<-YAML
+          Stuff:
+          - !FindInMap [RegionMap, !Ref "AWS::Region", AMI]
+          - !If [CreateProdResources, c1.xlarge, m1.small]
+          - !Join [ ":", [ "a", "b", "c" ] ]
+        YAML
+      end
+
+      it "expands to Fn::Whatever" do
+        expect(data).to eql(
+          "Stuff" => [
+            {
+              "Fn::FindInMap" => ["RegionMap", {"Ref"=>"AWS::Region"}, "AMI"]
+            },
+            {
+              "Fn::If" => ["CreateProdResources", "c1.xlarge", "m1.small"]
+            },
+            {
+              "Fn::Join" => [":", ["a", "b", "c"]]
+            }
+          ]
+        )
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Manage CloudFormation stacks