stackup 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d963de325ab9c50ad23fb0962aa34704dd002b48e9379d4437246d4298b763aa
-  data.tar.gz: da6d00022a700f509867f655ef64c1787f84c2091159f8cf9dc552d2682698eb
+  metadata.gz: e377001f70e0991601d52f67ddabf4ab13606eff27583f58433a9d4806a74191
+  data.tar.gz: 7c6f3d425651c9ef3266bf32c815efd01a4c052eeb7cd46c9c6fcf3c4541da6b
 SHA512:
-  metadata.gz: 619cfb540220d6b16477cb99ef8f04b71fd9470de38a6b55a2ed5d9ff25a0feaeb4f3a5491df3800bf32b8399aedb9a972576c995c2760cf22c1362358e1dfd0
-  data.tar.gz: ad748effec9ed41253d99b1789ceddd6841c948d32658186c99fd6871e2814e320d493a465a2ba0122b012f013dec117019fb994a7c2c667f741b2e822f1075d
+  metadata.gz: 3cb0be656aa5c84d209b6b840628d6dd0668c358147fb8cae30bd9e388b7df57161ed623d8c4158353fd791b4a669b20e60d49ab64f9a5582a6ad9ae29b1a78d
+  data.tar.gz: f987a896bc1e2b58d802e6134f1e8808d22bf38daeda11c8f84926e2c2ea76bdb2a60ce68e212b13b178d494c3cc12dec79b2d644ec60940a88d15e30ff992e1

data/README.md

@@ -78,10 +78,12 @@ For more details on usage, see
 
 ### Specifying parameters
 
-Stack parameters can be be read from a file, e.g.
+Stack parameters can be read from a file, e.g.
 
     $ stackup myapp-test up -t template.json -p parameters.json
 
+These files can be either JSON or YAML format, see [YAML support](#yaml-support) for more information.
+
 Parameters can be specified as simple key-value pairs:
 
 ```json
@@ -116,6 +118,22 @@ Or, you can specify one or more override parameters on the command-line, using `
       -o IndexDoc=index-override.html
       -o ContentDoc=content-override.html
 
+### Specifying tags
+
+Stack tags can be read from a file, e.g.
+
+    $ stackup myapp-test up -t template.json --tags tags.json
+
+These files can be either JSON or YAML format, see [YAML support](#yaml-support) for more information.
+
+Tags are specified as simple key-value pairs:
+
+```json
+{
+  "environment": "dev"
+}
+```
+
 ### Acknowledging Capabilities
 
 CloudFormation requires that some stacks explicitly acknowledge certain capabilities before creation. This helps to prevent the creation of stacks with unintended privileges.

data/bin/stackup

@@ -41,7 +41,7 @@ Clamp do
   option ["--[no-]wait"], :flag, "wait for stack updates to complete",
          :default => true
 
-  option ["--wait-poll-interval"], "N", "polling interval while waiting for updates",
+  option ["--wait-poll-interval"], "N", "polling interval (in seconds) while waiting for updates",
          :default => 5, &method(:Integer)
 
   option "--debug", :flag, "enable debugging"

data/lib/stackup/stack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aws-sdk-cloudformation"
 require "logger"
 require "multi_json"
@@ -16,10 +18,10 @@ module Stackup
     DEFAULT_WAIT_POLL_INTERVAL = 5 # seconds
 
     def initialize(name, client = {}, options = {})
-      client = Aws::CloudFormation::Client.new(client) if client.is_a?(Hash)
-      @name = name
+      client     = Aws::CloudFormation::Client.new(client) if client.is_a?(Hash)
+      @name      = name
       @cf_client = client
-      @wait = true
+      @wait      = true
       options.each do |key, value|
         public_send("#{key}=", value)
       end
@@ -282,7 +284,7 @@ module Stackup
     end
 
     def create(options)
-      options = options.dup
+      options              = options.dup
       options[:stack_name] = name
       options.delete(:stack_policy_during_update_body)
       options.delete(:stack_policy_during_update_url)
@@ -312,7 +314,7 @@ module Stackup
     def event_handler
       @event_handler ||= lambda do |e|
         fields = [e.logical_resource_id, e.resource_status, e.resource_status_reason]
-        time = e.timestamp.localtime.strftime("%H:%M:%S")
+        time   = e.timestamp.localtime.strftime("%H:%M:%S")
         logger.info("[#{time}] #{fields.compact.join(' - ')}")
       end
     end
@@ -369,7 +371,13 @@ module Stackup
           { :key => key, :value => value.to_s }
         end
       else
-        tags
+        tags.map do |tag|
+          if tag.key?("Key")
+            { :key => tag["Key"], :value => tag["Value"].to_s }
+          else
+            { :key => tag[:key], :value => tag[:value].to_s }
+          end
+        end
       end
     end
 
@@ -384,8 +392,8 @@ module Stackup
       handling_cf_errors do
         {}.tap do |result|
           cf_stack.public_send(collection_name).each do |item|
-            key = item.public_send(key_name)
-            value = item.public_send(value_name)
+            key         = item.public_send(key_name)
+            value       = item.public_send(value_name)
             result[key] = value
           end
         end

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "1.4.5".freeze
+  VERSION = "1.4.6".freeze
 
 end

data/spec/stackup/stack_spec.rb

@@ -260,6 +260,26 @@ describe Stackup::Stack do
 
       end
 
+      context "with :tags in SDK form as they arrive from file" do
+
+        before do
+          options[:tags] = [
+            { "Key" => "foo", "Value" => "bar" }
+          ]
+        end
+
+        it "converts them to an Array, that uses symbols as keys" do
+          expected_tags = [
+            { :key => "foo", :value => "bar" },
+          ]
+          create_or_update
+          expect(cf_client).to have_received(:create_stack) do |options|
+            expect(options[:tags]).to eq(expected_tags)
+          end
+        end
+
+      end
+
       context "with :tags in SDK form" do
 
         before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation