rubycfn 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d733dda0a2fd9505dc4e84d6d65670f3acbe1322
-  data.tar.gz: 782fc35dc9375763e592671ab952fa18679f80a6
+  metadata.gz: 77a1afcae7e2469088c77ddfdacc834ceb5dcedb
+  data.tar.gz: d4fbf293e830231a08448ae01c85930708a0da66
 SHA512:
-  metadata.gz: 68087c6444b29e2d5f26871dcdf8e805b3996481066c93f4a444cbe161d85d8372caccf980ad6b01496e360fc0d69fa9f5266c3ba22a6efa6bdff5809c3ad17b
-  data.tar.gz: 2d3780fb60ca99005a14248dced1e4f9041fda32efd2541a4ab921f14116e183c07bd0ef0cd346b561c697d2851f7bbd12594fa9b857c645b6d9e313c6e21ec6
+  metadata.gz: dff45cf27402459563b2148092d9c4328e61ae189cbeffcbe33330b852fe70c580cf32369b2c2b03b96c7aa4f6f22cd1486011a40573afe330c7590f6a4927d5
+  data.tar.gz: 095172e5e1aec34e99b439c3d253e359c29923171bd4473fddb913d04fafea3c8b865c40512597b2a11fd2984563fd4975fd98dec18f3cbc256e4563ac7a3a34

data/CHANGELOG.md

@@ -2,7 +2,12 @@
 All notable changes to Rubycfn will be documented in this file.
 This project uses [Semantic Versioning](http://semver.org/).
 
-## 0.4.1 (Next Release)
+## 0.4.2 (Next Release)
+
+## 0.4.1
+
+  * Fixed bug with DependsOn not being rendered correctly on multiple instances of resource -- [@dennisvink][@dennisvink]
+  * Added specs for Ref and Fn::GetAtt transformations with strings and symbols -- [@dennisvink][@dennisvink]
 
 ## 0.4.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubycfn (0.4.0)
+    rubycfn (0.4.1)
       activesupport (~> 5.1.5)
       dotenv (~> 2.4.0)
       json (~> 2.1.0)

data/README.md

@@ -61,7 +61,7 @@ __________ ____ __________________.___._________ _____________________
  |       _/    |   /|    |  _//   |   |/    \  \/ |    __)   |    |  _/
  |    |   \    |  / |    |   \\____   |\     \____|     \    |    |   \
  |____|_  /______/  |______  // ______| \______  /\___  /    |______  /
-        \/                 \/ \/               \/     \/            \/ [v0.4.0]
+        \/                 \/ \/               \/     \/            \/ [v0.4.1]
 Project name? example
 Account ID? 1234567890
 Select region EU (Frankfurt)

data/lib/rubycfn/version.rb

@@ -1,4 +1,4 @@
 # Rubycfn version
 module Rubycfn
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end

data/lib/rubycfn.rb

@@ -407,21 +407,12 @@ module Rubycfn
             # If the argument is a string, create an array out of it with a single element
             arguments[:depends_on] = arguments[:depends_on].class == Array && arguments[:depends_on] || [arguments[:depends_on]]
 
-            # `r.depends_on` is used to amend depends_on with resources with dynamic names
-            # Here we add them to arguments[:depends_on]
-            to_amend = TOPLEVEL_BINDING.eval("@depends_on")
-            unless to_amend.nil?
-              to_amend = to_amend.class == String && [to_amend] || to_amend
-              to_amend.each do |amend|
-                arguments[:depends_on].push(amend)
-              end
-            end
-            TOPLEVEL_BINDING.eval("@depends_on = []")
-
             # Finally, we render the DependsOn array
             arguments[:depends_on].map! { |resource| resource.class == String && resource.to_s || resource.to_s.split("_").map(&:capitalize).join }
           end
 
+          arguments[:depends_on] ||= []
+          rendered_depends_on = TOPLEVEL_BINDING.eval("@depends_on").nil? && arguments[:depends_on] || arguments[:depends_on] + TOPLEVEL_BINDING.eval("@depends_on")
           res = {
             "#{name.to_s}#{i.zero? ? "" : resource_postpend}": {
               Properties: TOPLEVEL_BINDING.eval("@properties"),
@@ -430,12 +421,11 @@ module Rubycfn
               UpdatePolicy: arguments[:update_policy],
               UpdateReplacePolicy: arguments[:update_replace_policy],
               Metadata: arguments[:metadata],
-              DependsOn: arguments[:depends_on],
+              DependsOn: rendered_depends_on,
               DeletionPolicy: arguments[:deletion_policy],
               CreationPolicy: arguments[:creation_policy]
             }
           }
-          arguments[:depends_on] = []
           TOPLEVEL_BINDING.eval("@aws_resources = @aws_resources.deep_merge(#{res})")
         end
         TOPLEVEL_BINDING.eval("@depends_on = []")

data/spec/lib/rubycfn_spec.rb

@@ -20,9 +20,13 @@ describe Rubycfn do
                    "WillReplace": true
                  }
                },
-               amount: 2 do |r|
-        r.depends_on [ "barFoo", :bar_foo ]
+               amount: 2 do |r, index|
+        r.depends_on [ "barFoo", :bar_foo ] unless index.positive?
         r.property(:name) { "RSpec" }
+        r.property(:security_group_id) { :rspec_security_group.ref }
+        r.property(:some_other_ref) { "rSpecSecurityGroup".ref }
+        r.property(:some_arn) { :rspec_resource.ref(:arn) }
+        r.property(:some_other_arn) { :rspec_resource.ref("FooBar") }
       end
     end
   end
@@ -54,6 +58,8 @@ describe Rubycfn do
       subject { resources }
 
       it { should have_key "RspecResourceName" }
+      it { should have_key "RspecResourceName2" }
+      it { should_not have_key "RspecResourceName3" }
 
       context "has resource type" do
         let(:resource) { resources["RspecResourceName"] }
@@ -71,6 +77,45 @@ describe Rubycfn do
           it { should eq ["FooBar", "fooBar", "barFoo", "BarFoo"] }
         end
 
+        context "has correct properties" do
+          let(:properties) { resource["Properties"] }
+          subject { properties }
+
+          it { should have_key "Name" }
+          it { should have_key "SecurityGroupId" }
+          it { should have_key "SomeOtherRef" }
+          it { should have_key "SomeArn" }
+          it { should have_key "SomeOtherArn" }
+
+          context "ref symbol is rendered correctly" do
+            let(:ref_symbol) { properties["SecurityGroupId"] }
+            subject { ref_symbol }
+
+            it { should eq JSON.parse({ Ref: "RspecSecurityGroup" }.to_json) }
+          end
+
+          context "ref string is rendered correctly" do
+            let(:ref_string) { properties["SomeOtherRef"] }
+            subject { ref_string }
+
+            it { should eq JSON.parse({ Ref: "rSpecSecurityGroup" }.to_json) }
+          end
+
+          context "Fn:GetAtt with symbol is rendered correctly" do
+            let(:fngetatt_symbol) { properties["SomeArn"] }
+            subject { fngetatt_symbol }
+
+            it { should eq JSON.parse({ "Fn::GetAtt": ["RspecResource", "Arn"] }.to_json) }
+          end
+
+          context "Fn:GetAtt with string is rendered correctly" do
+            let(:fngetatt_string) { properties["SomeOtherArn"] }
+            subject { fngetatt_string }
+
+            it { should eq JSON.parse({ "Fn::GetAtt": ["RspecResource", "FooBar"] }.to_json) }
+          end
+        end
+
         context "resource type is correct" do
           let(:type) { resource["Type"] }
           subject { type }
@@ -89,7 +134,23 @@ describe Rubycfn do
           let(:update_policy) { resource["UpdatePolicy"] }
           subject { update_policy }
 
-          it { should include("AutoScalingReplacingUpdate" => { "WillReplace" => true })}
+          it { should eq JSON.parse({ AutoScalingReplacingUpdate: { WillReplace: true }}.to_json) }
+        end
+      end
+      context "second resource does not have depends_on" do
+        let(:resource) { resources["RspecResourceName2"] }
+        subject { resource }
+
+        it { should have_key "DependsOn" }
+        it { should have_key "Type" }
+        it { should have_key "Properties" }
+        it { should have_key "UpdatePolicy"}
+
+        context "second resource renders only the initial depends_on resources" do
+          let(:depends_on)  { resource["DependsOn"] }
+          subject { depends_on }
+
+          it { should eq ["FooBar", "fooBar"] }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dennis Vink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson