cfer 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78cb715113442fbbec2fa9c33e2e243bd048960c
-  data.tar.gz: f48b5126eebba1e069e2a26f8de51d9fc5f49d80
+  metadata.gz: 4f1a58671c07486f353aa90896557273e4d3e241
+  data.tar.gz: da2c6b400309256e52e037fb779e7ad9ffbec7ef
 SHA512:
-  metadata.gz: 16f2f7eec9dab63812568214952a1aee5668a9553c4c9156346f9a8dffe43e07a6a63e0667bb8491ce9d225493a631c5132af794afb5679bb43afd69896bfa9d
-  data.tar.gz: c4978b1220c8ce036a6fb4b2b96d695af2cd39b79a18e50371a58434102c8803df735ca18c0625a494c6d58bd798a6de0a82c855c6ce42bdd3fc89ae251319a5
+  metadata.gz: 5dd4d902637c52dff7d817408bc31ff0a6369e9ff7d9f6698622007fd732d5b550b7c7b5ebee18998925660964caeceed18722cee2c4f7587c260c08a6a98c53
+  data.tar.gz: b60810b50244a46dbf5e81c67be25e67b6ee41cda5f08f225a8d570b5575d01c65ae390ec9fb4bc61a065c0e73123aabe0fcbf7946def8159534ffd3b83f72f7

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Cfer Change Log
 
+## 0.6.0
+
+### Enhancements
+* Colorized JSON in `generate` for more readable output. #41
+* Adds `--notification-arns` CLI option. #43
+* Adds `--role-arn` CLI option. #46
+
+### Bugfixes
+* Don't dump backtrace when trying to delete a nonexistent stack. #42
+
 ## 0.5.0
 
 ### **BREAKING CHANGES**

data/lib/cfer.rb

@@ -85,11 +85,17 @@ module Cfer
             when 'Continue'
               retry
             when 'Rollback'
+              rollback_opts = {
+                stack_name: stack_name
+              }
+
+              rollback_opts[:role_arn] = options[:role_arn] if options[:role_arn]
+
               case operation
               when :created
-                cfn_stack.delete_stack stack_name: stack_name
+                cfn_stack.delete_stack rollback_opts
               when :updated
-                cfn_stack.cancel_update_stack stack_name: stack_name
+                cfn_stack.cancel_update_stack rollback_opts
               end
               retry
             end
@@ -185,11 +191,22 @@ module Cfer
       config(options)
       cfn = options[:aws_options] || {}
       cfn_stack = options[:cfer_client] || cfn_stack = Cfer::Cfn::Client.new(cfn.merge(stack_name: stack_name))
-      cfn_stack.delete_stack(stack_name: stack_name)
+
+      delete_opts = {
+        stack_name: stack_name
+      }
+      delete_opts[:role_arn] = options[:role_arn] if options[:role_arn]
+      cfn_stack.delete_stack(delete_opts)
 
       if options[:follow]
         tail! stack_name, options.merge(cfer_client: cfn_stack)
       end
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      if e.message =~ /Stack .* does not exist/
+        raise Cfer::Util::StackDoesNotExistError, e.message
+      else
+        raise e
+      end
     end
 
     # Builds a Cfer::Core::Stack from a Ruby block
@@ -270,7 +287,7 @@ module Cfer
 
     def render_json(obj, options = {})
       if options[:pretty_print]
-        puts JSON.pretty_generate(obj, options)
+        puts Cfer::Util::Json.format_json(obj)
       else
         puts obj.to_json
       end
@@ -336,6 +353,7 @@ block.rb
 config.rb
 
 util/error.rb
+util/json.rb
 
 core/hooks.rb
 core/client.rb
@@ -349,4 +367,3 @@ cfn/client.rb
   require "#{File.dirname(__FILE__)}/cfer/#{f}"
 end
 Dir["#{File.dirname(__FILE__)}/cferext/**/*.rb"].each { |f| require(f) }
-

data/lib/cfer/cfn/client.rb

@@ -119,6 +119,8 @@ module Cfer::Cfn
 
       stack_options[:on_failure] = options[:on_failure] if options[:on_failure]
       stack_options[:timeout_in_minutes] = options[:timeout] if options[:timeout]
+      stack_options[:role_arn] = options[:role_arn] if options[:role_arn]
+      stack_options[:notification_arns] = options[:notification_arns] if options[:notification_arns]
 
       stack_options.merge! parse_stack_policy(:stack_policy, options[:stack_policy])
 

data/lib/cfer/cli.rb

@@ -39,9 +39,14 @@ module Cfer
       optional nil, 'on-failure', 'The action to take if the stack creation fails'
       optional nil, 'timeout', 'The timeout (in minutes) before the stack operation aborts'
       #flag   nil, 'git-lock', 'When enabled, Cfer will not converge a stack in a dirty git tree'
+      optional nil,
+               'notification-arns',
+               'SNS topic ARN to publish stack related events. This option can be supplied multiple times.',
+               multiple: true
 
       optional :s,  'stack-policy', 'Set a new stack policy on create or update of the stack [file|url|json]'
       optional :u,  'stack-policy-during-update', 'Set a temporary overriding stack policy during an update [file|url|json]'
+      optional nil, 'role-arn', 'Pass a specific role ARN for CloudFormation to use (--role-arn in AWS CLI)'
 
       optional nil, 'change', 'Issues updates as a Cfn change set.'
       optional nil, 'change-description', 'The description of this Cfn change'
@@ -128,6 +133,8 @@ module Cfer
       usage 'delete <stack>'
       summary 'Deletes a CloudFormation stack'
 
+      optional nil, 'role-arn', 'Pass a specific role ARN for CloudFormation to use (--role-arn in AWS CLI)'
+
       run do |options, args, cmd|
         Cfer::Cli.fixup_options(options)
         options[:number] = 0
@@ -156,10 +163,10 @@ module Cfer
         Cfer::LOGGER.fatal "Template error: #{e.message}"
         Cfer::LOGGER.fatal Cfer::Cli.format_backtrace(e.template_backtrace) unless e.template_backtrace.empty?
         exit 1
-      rescue Cfer::Util::CferError => e
+      rescue Cfer::Util::CferError, Cfer::Util::StackDoesNotExistError => e
         Cfer::LOGGER.error "#{e.message}"
         exit 1
-      rescue  StandardError => e
+      rescue StandardError => e
         Cfer::LOGGER.fatal "#{e.class.name}: #{e.message}"
         Cfer::LOGGER.fatal Cfer::Cli.format_backtrace(e.backtrace) unless e.backtrace.empty?
 

data/lib/cfer/core/stack.rb

@@ -155,7 +155,11 @@ module Cfer::Core
     # Renders the stack into a CloudFormation template.
     # @return [String] The final template
     def to_cfn
-      to_h.to_json
+      if @options[:pretty_print]
+        JSON.pretty_generate(to_h)
+      else
+        to_h.to_json
+      end
     end
 
     # Gets the Cfn client, if one exists, or throws an error if one does not

data/lib/cfer/util/json.rb

@@ -0,0 +1,82 @@
+require 'rainbow'
+require 'json'
+
+module Cfer::Util::Json
+  class << self
+
+  QUOTE = '"'
+  LBRACE = Rainbow('{').green
+  RBRACE = Rainbow('}').green
+  LBRACKET = Rainbow('[').green
+  RBRACKET = Rainbow(']').green
+  COLON = Rainbow(': ').green
+
+  def format_json(item)
+    case item
+    when Hash
+      format_hash(item)
+    when Array
+      format_array(item)
+    when String
+      format_string(item)
+    when Numeric
+      format_number(item)
+    when TrueClass || FalseClass
+      format_bool(item)
+    else
+      format_string(item.to_s)
+    end
+  end
+
+  private
+  def format_string(s)
+    s.to_json
+  end
+
+  def format_number(n)
+    n.to_json
+  end
+
+  def format_bool(b)
+    b.to_json
+  end
+
+  def format_hash(h)
+    LBRACE +
+    if h.empty?
+      ' '
+    else
+      "\n" +
+      indent do
+        h.map { |k, v| format_pair(k, v) }.join(",\n")
+      end +
+      "\n"
+    end +
+    RBRACE
+  end
+
+  def format_pair(k, v)
+    QUOTE + Rainbow(k).bright + QUOTE + COLON + format_json(v)
+  end
+
+  def format_array(a)
+    LBRACKET +
+    if a.empty?
+      ' '
+    else
+      "\n" +
+      indent do
+        a.map { |i| format_json(i) }.join(",\n")
+      end +
+      "\n"
+    end +
+    RBRACKET
+  end
+
+  def indent
+    str = yield
+    "  " + str.gsub(/\n/, "\n  ")
+  end
+
+  end
+end

data/lib/cfer/version.rb

@@ -1,5 +1,5 @@
 module Cfer
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 
   begin
     require 'semantic'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sean Edwards
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -238,6 +238,7 @@ files:
 - lib/cfer/core/resource.rb
 - lib/cfer/core/stack.rb
 - lib/cfer/util/error.rb
+- lib/cfer/util/json.rb
 - lib/cfer/version.rb
 - lib/cferext/aws/auto_scaling/auto_scaling_group.rb
 - lib/cferext/aws/cloud_formation/wait_condition.rb