convection 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c47278ea072d6254e3d9b6bd60ff0b34b26d5c5
-  data.tar.gz: eae63705e881e7b7efa4cc2a5c3376bc453f39b1
+  metadata.gz: 3a392fc50dc24347f0d9d1d2c053c60452012456
+  data.tar.gz: a507193b6289edd3ae3e66d2dc6f4a1e18e567b1
 SHA512:
-  metadata.gz: b6655098f7f79a48236e71f5c20df2a2c236aa3fed7025789d92642df1369d763ec5e70a8e71436f363e062d7549520c6959e5e83452bd454229f0d84bf0f0a0
-  data.tar.gz: 7f8a5150e724eea1ce80a5a6d25a6da6520233242a5a53f985225dabc3739fecc2693269052c75dec5a320e0ef11838cc3305a37dd14e4154af7fc0c48db167a
+  metadata.gz: ba1be75c5946facbc993de9e60dbaf156246a5dc6d005ccadab022ab394216224355750c0005124e2fbd031aca40278d83c6d171c3a2ec19b5e9735537a1c832
+  data.tar.gz: 5ef6b2ca93239b47cc53b0ae802f3dcc6fdd942097cc842d840156a8298d8fdecab76f67146827c219dbc587e046fdd9a9aad23c178d6fe36363ae6db1c82863

data/.gitignore

@@ -23,3 +23,5 @@ attic
 *.swp
 *.swo
 *.gem
+*.iml
+.rakeTasks

data/.rubocop_todo.yml

@@ -1,11 +1,47 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-02-05 13:27:18 -0500 using RuboCop version 0.37.0.
+# on 2017-11-20 16:26:30 +0000 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'convection.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Exclude:
+    - 'lib/convection/control/stack.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
+Layout/FirstParameterIndentation:
+  Exclude:
+    - 'lib/convection/model/mixin/taggable.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+Layout/IndentHeredoc:
+  Exclude:
+    - 'yard_extensions/properties_handler.rb'
+
 # Offense count: 1
 Lint/HandleExceptions:
   Exclude:
@@ -16,37 +52,38 @@ Lint/UselessAssignment:
   Exclude:
     - 'lib/convection/model/template.rb'
 
-# Offense count: 30
+# Offense count: 29
 Metrics/AbcSize:
-  Max: 57
+  Max: 63
 
-# Offense count: 3
+# Offense count: 34
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 140
+
+# Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Exclude:
-    - 'lib/convection/control/stack.rb'
-  Max: 304
+  Max: 372
 
-# Offense count: 6
+# Offense count: 14
 Metrics/CyclomaticComplexity:
-  Max: 13
+  Max: 19
 
-# Offense count: 122
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# Offense count: 366
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 151
+  Max: 236
 
-# Offense count: 32
+# Offense count: 36
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Exclude:
-    - 'lib/convection/control/stack.rb'
-  Max: 37
+  Max: 41
 
-# Offense count: 5
+# Offense count: 12
 Metrics/PerceivedComplexity:
-  Max: 13
+  Max: 20
 
 # Offense count: 2
 Style/AccessorMethodName:
@@ -64,31 +101,113 @@ Style/Alias:
     - 'lib/convection/model/template/resource_property.rb'
     - 'lib/convection/model/template/resource_property/aws_ec2_network_interface.rb'
 
-# Offense count: 3
+# Offense count: 41
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
-  Exclude:
-    - 'lib/convection/model/template.rb'
-    - 'spec/**/*'
+  Enabled: false
 
 # Offense count: 4
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
+    - 'test/**/*'
     - 'lib/convection/model/attributes.rb'
     - 'lib/convection/model/mixin/colorize.rb'
     - 'lib/convection/model/template/condition.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Style/FirstParameterIndentation:
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, expanded
+Style/EmptyMethod:
   Exclude:
-    - 'lib/convection/model/mixin/taggable.rb'
+    - 'lib/convection/model/template/resource_collection.rb'
 
-# Added manually
-Style/ConditionalAssignment:
+# Offense count: 233
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MultilineIfModifier:
   Exclude:
-    - 'lib/convection/model/template/condition.rb'
+    - 'lib/convection/control/stack.rb'
+    - 'lib/convection/model/template/resource.rb'
+    - 'spec/convection/model/template/resource_collection_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/convection/control/stack.rb'
+
+# Offense count: 29
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'bin/convection'
+    - 'convection.gemspec'
+    - 'lib/convection/control/stack.rb'
+    - 'lib/convection/model/template.rb'
+    - 'lib/convection/model/template/resource_property/aws_cloudfront_cachebehavior.rb'
+    - 'lib/convection/model/template/resource_property/aws_cloudfront_defaultcachebehavior.rb'
+    - 'spec/convection/control/stack_spec.rb'
+    - 'spec/convection/dsl/intrinsic_functions_spec.rb'
+    - 'spec/convection/model/cloudfile_spec.rb'
+    - 'spec/convection/model/template/resource/events_rule_spec.rb'
+    - 'spec/convection/model/template/resource/lambdas_spec.rb'
+    - 'spec/convection/model/template/resource/permission_spec.rb'
+    - 'spec/convection/model/template/resource/vpc_endpoints_spec.rb'
+    - 'spec/ec2_client_context.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'convection.gemspec'
+
+# Offense count: 17
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil.
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/convection/control/cloud.rb'
+    - 'lib/convection/control/stack.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize, SupportedStyles.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
+# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
+Style/TernaryParentheses:
+  Exclude:
+    - 'lib/convection/dsl/helpers.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    - 'convection.gemspec'
+
+# Offense count: 4
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, normalcase, non_integer
+Style/VariableNumber:
+  Exclude:
+    - 'lib/convection/dsl/intrinsic_functions.rb'

data/.ruby-version

@@ -1 +1 @@
-2.3
+2.3.5

data/Gemfile

@@ -7,7 +7,7 @@ group :development do
   gem 'bundler', '~> 1.7'
   gem 'rspec'
   gem 'rake', '~> 10.0'
-  gem 'rubocop', '~> 0.40.0'
+  gem 'rubocop', '~> 0.49.0'
   gem 'simplecov'
   gem 'thor-scmversion', '= 1.7.0'
   gem 'yard'

data/bin/convection

@@ -23,6 +23,7 @@ module Convection
     option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks', default: true
     option :cloudfiles, :type => :array, :default => %w(Cloudfile)
     option :delayed_output, :type => :boolean, :desc => 'Delay output until operation completion.', :default => false
+    option :retain, :type => :boolean, :desc => 'Retain stack resources, without deleteing.', :default => false
     def converge(stack = nil)
       @outputs = []
       operation('converge', stack)
@@ -62,6 +63,7 @@ module Convection
     option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks'
     option :cloudfiles, :type => :array, :default => %w(Cloudfile)
     option :delayed_output, :type => :boolean, :desc => 'Delay output until operation completion.', :default => false
+    option :retain, :type => :boolean, :desc => 'Retain stack resources, without deleteing.', :default => false
     def diff(stack = nil)
       @outputs = []
       operation('diff', stack)
@@ -133,7 +135,11 @@ module Convection
               cloud_array[:cloud].configure(File.absolute_path(cloud_array[:cloudfile_path], @cwd))
               cloud = cloud_array[:cloud]
               region = cloud.cloudfile.region
-              cloud.send(task_name, stack, stack_group: options[:stack_group], stacks: options[:stacks], exclude_stacks: options[:exclude_stacks]) do |event, errors|
+              operation_kwargs = {
+                stack_group: options[:stack_group], stacks: options[:stacks],
+                exclude_stacks: options[:exclude_stacks], retain: options[:retain]
+              }
+              cloud.send(task_name, stack, operation_kwargs) do |event, errors|
                 if options[:cloudfiles].length > 1 && options[:delayed_output]
                   output << { event: event, errors: errors }
                 else

data/lib/convection/control/cloud.rb

@@ -91,7 +91,7 @@ module Convection
 
         filter_deck(options, &block).each_value do |stack|
           block.call(Model::Event.new(:converge, "Stack #{ stack.name }", :info)) if block
-          stack.apply(&block)
+          stack.apply(retain: options[:retain], &block)
 
           emit_credential_error_and_exit!(stack, &block) if stack.credential_error?
           if stack.error?
@@ -142,7 +142,7 @@ module Convection
         filter_deck(options, &block).each_value do |stack|
           block.call(Model::Event.new(:compare, "Compare local state of stack #{ stack.name } (#{ stack.cloud_name }) with remote template", :info))
 
-          difference = stack.diff
+          difference = stack.diff(retain: options[:retain])
           # Find errors during diff
           emit_credential_error_and_exit!(stack, &block) if stack.credential_error?
           if stack.error?

data/lib/convection/control/stack.rb

@@ -87,7 +87,6 @@ module Convection
       # Represents a stack task that is currently in progress.
       TASK_IN_PROGRESS = 'TASK_IN_PROGRESS'.freeze
 
-      # rubocop:disable Metrics/LineLength
       # @param name [String] the name of the CloudFormation Stack
       # @param template [Convection::Model::Template] a wrapper of the
       #   CloudFormation template (can be rendered into CF JSON)
@@ -148,7 +147,6 @@ module Convection
         #     clouds use this, for example, to create security groups early
         #     in the dependency tree to avoid the chicken-and-egg problem.
         @template.execute
-
       rescue Aws::Errors::ServiceError => e
         @errors << e
       end
@@ -167,7 +165,6 @@ module Convection
       rescue Aws::Errors::ServiceError => e
         @errors << e
       end
-      # rubocop:enable Metrics/LineLength
 
       def cloud_name
         return @cloud_name unless @cloud_name.nil?
@@ -281,8 +278,8 @@ module Convection
       #   template (in CloudFormation) and the state of the rendered
       #   template (what *would* be converged).
       # @see Convection::Model::Template#diff
-      def diff
-        @template.diff(@current_template)
+      def diff(retain: false)
+        @template.diff(@current_template, retain: retain)
       end
 
       # @return [Boolean] whether the Resources section of the rendered
@@ -324,9 +321,9 @@ module Convection
       #
       # @param block [Proc] a configuration block to pass any
       #   {Convection::Model::Event}s to.
-      def apply(&block)
+      def apply(retain: false, &block)
         request_options = @options.clone.tap do |o|
-          o[:template_body] = to_json
+          o[:template_body] = to_json(retain: retain)
           o[:parameters] = cf_parameters
           o[:capabilities] = capabilities
         end
@@ -334,7 +331,7 @@ module Convection
         # Get the state of existence before creation
         existing_stack = exist?
         if existing_stack
-          if diff.empty? ## No Changes. Just get resources and move on
+          if diff(retain: retain).empty? ## No Changes. Just get resources and move on
             block.call(Model::Event.new(:complete, "Stack #{ name } has no changes", :info)) if block
             get_status
             return
@@ -554,7 +551,7 @@ module Convection
               collection << event
             end
 
-            break if pages == 0
+            break if pages.zero?
           end
 
           @last_event_seen = collection.first.event_id unless collection.empty?

data/lib/convection/model/template.rb

@@ -251,7 +251,7 @@ module Convection
         end
       end
 
-      def render(stack_ = nil)
+      def render(stack_ = nil, retain: false)
         ## Instantiate a new template with the definition block and an other stack
         return clone(stack_).render unless stack_.nil?
 
@@ -263,7 +263,12 @@ module Convection
           'Parameters' => parameters.map(&:render),
           'Mappings' => mappings.map(&:render),
           'Conditions' => conditions.map(&:render),
-          'Resources' => all_resources.map(&:render),
+          'Resources' => all_resources.map do |resource|
+            if retain && resource.deletion_policy.nil?
+              resource.deletion_policy('Retain')
+            end
+            resource.render
+          end,
           'Outputs' => outputs.map(&:render),
           'Metadata' => metadata.map(&:render)
         }
@@ -275,12 +280,12 @@ module Convection
         end
       end
 
-      def diff(other, stack_ = nil)
-        render(stack_).diff(other).map { |diff| Diff.new(diff[0], *diff[1]) }
+      def diff(other, stack_ = nil, retain: false)
+        render(stack_, retain: retain).diff(other).map { |diff| Diff.new(diff[0], *diff[1]) }
       end
 
-      def to_json(stack_ = nil, pretty = false)
-        rendered_stack = render(stack_)
+      def to_json(stack_ = nil, pretty = false, retain: false)
+        rendered_stack = render(stack_, retain: retain)
         validate(rendered_stack)
         return JSON.generate(rendered_stack) unless pretty
         JSON.pretty_generate(rendered_stack)

data/lib/convection/model/template/condition.rb

@@ -38,13 +38,8 @@ module Convection
           end
 
           def render
-            rendered_values = []
-            @function_arguments.each do |function_arg|
-              if function_arg.respond_to? :render # the argument is another conditional function
-                rendered_values << function_arg.render
-              else
-                rendered_values << function_arg
-              end
+            rendered_values = Array(@function_arguments).map do |function_arg|
+              function_arg.respond_to?(:render) ? function_arg.render : function_arg
             end
 
             { CONDITIONAL_FUNCTION_SYNTAX_MAP[@function_name] => rendered_values }

data/lib/convection/model/template/resource.rb

@@ -323,13 +323,13 @@ module Convection
           @depends_on << (resource.is_a?(Resource) ? resource.name : resource)
         end
 
-        # rubocop:disable Style/TrivialAccessors
         #   We don't want to use an accessor (e.g. deletion_policy=) because
         #   this is a DSL method
-        def deletion_policy(deletion_policy)
+        def deletion_policy(deletion_policy = :unset_deletion_policy)
+          return @deletion_policy if deletion_policy == :unset_deletion_policy
+
           @deletion_policy = deletion_policy
         end
-        # rubocop:enable Style/TrivialAccessors
 
         def reference
           {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk