cfncli 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjNiNjlmM2JmYzE1YTY1MWE5MjYyNjQ4MDcwZWNkNDFjNzM0MGVjNA==
+    OTM5YTRjNGYyYjhmZjc5YWI2ZTc3NWFhYzliMjIzZTMyMjE0ZDM5Nw==
   data.tar.gz: !binary |-
-    MzVhNzQ1MzExYjZjOTJlNTgyZjczZDliMTUxZjdjOTQyMTVhYzY2ZA==
+    Yzk3ZmMxOGQzMzA0M2IyZWU4NmI2NzFiNDc0NzgwMTEyZDllYmI5Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZjRlZDA3YzA3MmY5ZWUyOGE5ZTRhNjQ3YWNlNTBiNmE0Y2E4MTFiMTc1ZWM4
-    Y2VhZGQ5ZDdlYjU4YjJjYjBlMTlhZmNkZmNkOWJhYTMyMzc2N2Y2YTdlYjg1
-    NGI5NGRjYjljOGJmMmJiZjkxYTZlNWNkZmYxOGEwZTQyZmQxNjI=
+    ZjdjMzAzYTIyZWI5Zjk2MWE0MTgzY2RmMThkMmViOWU3MjE0ZGQxMTU5YWJh
+    ODQzYmQxMGQ3OWIzZjc0ZGU0NDc4YTc5OTRkNWExOWIxYjkzMmVkOGU2NWZi
+    ODBmNTc1N2VmMDU1MmFlMDUxZTUwOWVjMzdiMWEzNjQ2ZGViN2M=
   data.tar.gz: !binary |-
-    ODRkMGE3ZGI5NGY4MWI1NGJkYTllN2IwMmFmMjNkYWZiZTUwYTQ2ZGIxMDFh
-    OTAzZmE5NzEzMDM1MGQxMTViZDYxZjBjNDM0OTQ1NTNiM2QwN2E1NjYzNzI0
-    MWE1MWVkZjEyZTcyNjAwYTkxOGIwOGY1NzRlYjYxZjNlNjAzMTI=
+    ZTI2MGYyNWExNTljMmI4ZjRlMTZhMWI4MDdiNzNhZGNmODgwMmEyZjViZjkw
+    OWNiZjRkOGQwYzdjNjg1N2ZhYzgyZTI1YTYxY2RkMGI2OTBmYjBhY2RiYzll
+    NzE3ODJlYzNkODNhZGIyODZiZmMzZjI3NWNiZWI1MDA5MjQ3NGI=

data/lib/cfncli/cfn_client.rb

@@ -4,11 +4,17 @@ module CfnCli
   module CfnClient
 
     attr_accessor :stub_responses
+    attr_accessor :retry_limit
+    attr_accessor :retry_backoff
 
     # CloudFormation client
     # @see http://docs.aws.amazon.com/sdkforruby/api/Aws/CloudFormation/Client.html
     def cfn_client
-      @@client ||= Aws::CloudFormation::Client.new(stub_responses: stub_responses || false)
+      options ||= {}
+      options[:retry_limit] = @retry_limit if @retry_limit
+      options[:retry_backoff] = @retry_backoff if @retry_backoff
+      options[:stub_responses] = @stub_responses || false
+      @@client ||= Aws::CloudFormation::Client.new(**options)
     end
 
     # Clouformation Resource

data/lib/cfncli/cli.rb

@@ -23,7 +23,7 @@ module CfnCli
                   type: :numeric,
                   default: 1,
                   desc: 'Log level to display (0=DEBUG, 1=INFO, 2=ERROR, 3=CRITICAL)'
-  
+
     class_option 'config_file',
                   type: :string,
                   default: 'cfncli.yml',
@@ -56,7 +56,6 @@ module CfnCli
 
     method_option 'disable_rollback',
                   type: :boolean,
-                  default: false,
                   desc: 'Disable rollbacks in case of a stack update failure'\
                         ' This is mutually exclusive with on_failure.'
 
@@ -81,7 +80,7 @@ module CfnCli
 
     method_option 'stack_policy_body',
                   type: :string,
-                  desc: 'JSON String containing the stack policy body. The @filename syntax can be used.' 
+                  desc: 'JSON String containing the stack policy body. The @filename syntax can be used.'
 
     method_option 'stack_policy_url',
                   type: :string,
@@ -114,35 +113,41 @@ module CfnCli
                   default: false,
                   desc: 'Fails if a stack has nothing to update'
 
+    method_option 'retry_limit',
+                  type: :numeric,
+                  default: 5,
+                  desc: 'Maximum number of retries for the AWS backoff mechanism'
+
     desc 'apply', 'Creates a stack in Cloudformation'
     def apply
       opts = process_params(options)
 
       stack_name = opts['stack_name']
       fail ArgumentError, 'stack_name is required' unless stack_name
-    
+
       timeout = consume_option(opts, 'timeout')
       interval = consume_option(opts, 'interval')
       retries = timeout / interval
       fail_on_noop = consume_option(opts, 'fail_on_noop')
       list_events = consume_option(opts, 'list_events')
+      retry_limit = consume_option(opts, 'retry_limit')
       config_file = consume_option(opts, 'config_file')
 
       ENV['CFNCLI_LOG_LEVEL'] = consume_option(opts, 'log_level').to_s
 
       logger.debug "Apply parameters: #{options.inspect}"
 
-      client_config = Config::CfnClient.new(interval, retries, fail_on_noop)
+      client_config = Config::CfnClient.new(interval, retries, fail_on_noop, retry_limit)
 
-      res = ExitCode::OK 
+      res = ExitCode::OK
       if list_events
-        cfn.apply_and_list_events(opts, client_config) 
+        cfn.apply_and_list_events(opts, client_config)
         res = ExitCode::STACK_ERROR unless cfn.stack_successful? stack_name
       else
         cfn.create_stack(opts, client_config)
       end
 
-      puts "Stack creation #{res == 0 ? 'successful' : 'failed'}"
+      puts "Stack #{stack_name} creation #{res == 0 ? 'successful' : 'failed'}"
       exit res
     rescue Aws::CloudFormation::Errors::ValidationError => e
       puts e.message
@@ -168,13 +173,13 @@ module CfnCli
     desc 'events', 'Displays the events for a stack in realtime'
     def events
       stack_name = options['stack_name']
-      
+
       fail ArgumentError, 'stack_name is required' unless stack_name
-      
+
       config = Config::CfnClient.new(options['interval'], options['retries'])
       cfn.events(stack_name, config)
     end
-    
+
     method_option 'stack_name',
                   aliases: ['-n'],
                   type: :string,
@@ -195,9 +200,9 @@ module CfnCli
     def delete
       opts = options.dup
       stack_name = opts['stack_name']
-      
+
       fail ArgumentError, 'stack_name is required' unless stack_name
-      
+
       interval = consume_option(opts, 'interval')
       timeout = consume_option(opts, 'timeout')
       consume_option(opts, 'log_level')
@@ -279,7 +284,7 @@ module CfnCli
 
       # Converts a parameter JSON file to the format expected by CloudFormation
       # @param filename Path to the JSON file containing the parameters description
-      # @return 
+      # @return
       def process_stack_parameters_file(filename)
         content = File.read(filename)
         return CloudFormation.parse_json_params(JSON.parse(content))

data/lib/cfncli/config.rb

@@ -8,16 +8,20 @@ module CfnCli
     rescue Errno::ENOENT
       nil
     end
-  
+
     class CfnClient
       attr_accessor :interval
       attr_accessor :retries
       attr_accessor :fail_on_noop
-      
-      def initialize(interval = 10, retries = 30, fail_on_noop = false)
+      attr_accessor :aws_retry_limit
+      attr_accessor :aws_retry_backoff
+
+      def initialize(interval = 10, retries = 30, fail_on_noop = false, aws_retry_limit = 5, aws_retry_backoff = nil)
         @interval = interval
         @retries = retries
         @fail_on_noop = fail_on_noop
+        @aws_retry_limit = aws_retry_limit
+        @aws_retry_backoff = aws_retry_backoff
       end
     end
   end

data/lib/cfncli/stack.rb

@@ -25,6 +25,9 @@ module CfnCli
       @stack_name = stack_name
       @config = config || default_config
       @child_stacks = Concurrent::Array.new
+
+      @retry_limit = @config.aws_retry_limit
+      @retry_backoff = @config.aws_retry_backoff
     end
 
     def default_config

data/lib/cfncli/version.rb

@@ -1,3 +1,3 @@
 module CfnCli
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfncli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - lethalpaga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler