convection 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 486c187ed6d2866b20482f3a6f9372fc55fe5221
-  data.tar.gz: cea1c54e561e17833b76268a28aaf087a0cc55c2
+  metadata.gz: 6bddc9ee70240274d2d53091ce1a716994cb62c5
+  data.tar.gz: 7bfd13c612923a219054c045b689e6dbfb29a4e7
 SHA512:
-  metadata.gz: 492e23623acbebb0995c788c64b6cceebb576ef9cae1cb034408e8b8f980fb770e2c74874e947a7da0351a9be14ca383c96181b60bc65c151f12535d20ccc766
-  data.tar.gz: d818dafdaeff98149a200dc97588b7eb85313d1a7c93af01e307a069ad0e7e66ebb6ec65e666d2d9c0a2a15777cefba0fa3378a8c567f069ce81651daf608d04
+  metadata.gz: fe5142078018772cb99ccca5871f84426c6b01339ded1ce404b169c742b6d082ac2b6a8e55c46915ce15527e5357d3d9a5268e918711221c1cb91b0768ac38e6
+  data.tar.gz: cb4cbaa7a1c2fb71fece9ab855df289df6b88ba9cace85556852202515b23e3b5b5f08f7e9dd14442ef9e7f38c52ce8db9868c935d7fc21eb8c0d2b3fb50875e

data/.rubocop.yml

@@ -3,12 +3,12 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   Include:
     - lib/**/*
-    - bin/**/*
     - Gemfile
     - Rakefile
     - Thorfile
   Exclude:
     - example/**/*
+    - bin/convection
     - 'lib/convection/model/template/mapping.rb' # Something is causing this file to fail
 
 Encoding:

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-11-20 16:26:30 +0000 using RuboCop version 0.49.1.
+# on 2017-12-12 19:16:51 +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
@@ -20,12 +20,6 @@ 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.
@@ -52,38 +46,36 @@ Lint/UselessAssignment:
   Exclude:
     - 'lib/convection/model/template.rb'
 
-# Offense count: 29
+# Offense count: 33
 Metrics/AbcSize:
-  Max: 63
+  Max: 81
 
-# Offense count: 34
+# Offense count: 35
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  ExcludedMethods:
-    - no_commands
-  Max: 140
+  Max: 162
 
 # Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 372
 
-# Offense count: 14
+# Offense count: 17
 Metrics/CyclomaticComplexity:
   Max: 19
 
-# Offense count: 366
+# Offense count: 398
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 236
 
-# Offense count: 36
+# Offense count: 39
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 41
+  Max: 58
 
-# Offense count: 12
+# Offense count: 15
 Metrics/PerceivedComplexity:
   Max: 20
 
@@ -126,7 +118,7 @@ Style/EmptyMethod:
   Exclude:
     - 'lib/convection/model/template/resource_collection.rb'
 
-# Offense count: 233
+# Offense count: 235
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: when_needed, always, never
@@ -141,16 +133,7 @@ Style/MultilineIfModifier:
     - '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
+# Offense count: 30
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:

data/bin/convection

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'thor'
 require_relative '../lib/convection/control/cloud'
+require 'fileutils'
 require 'thread'
 require 'yaml'
 
@@ -154,6 +155,87 @@ module Convection
       template.resources.each(&method(:import_resources))
     end
 
+    desc 'terraform-import-lambda-permissions', 'Import state for a lambda permission resource into terraform management'
+    option :cloudfile, desc: 'The cloudfile to load', default: 'Cloudfile'
+    option :module_path, desc: 'The module path prefix for terraform', default: DEFAULT_MODULE_PATH
+    option :state, desc: 'The source terraform state file', required: true
+    option :state_out, desc: 'The destination state file (default: --state)'
+    def terraform_import_lambda_permissions(stack_name)
+      # Lazy load this since we only want this in the terraform subcommand.
+      require 'active_support/core_ext/string/inflections'
+
+      state = File.expand_path(options[:state])
+      state_out = File.expand_path(options[:state_out]) if options[:state_out]
+      unless state_out
+        state_out = state
+        FileUtils.cp(state, "#{state}.#{Time.now.to_i}.backup")
+      end
+
+      tfstate = JSON.parse(File.read(options[:state]))
+      module_path = options[:module_path].split('.')
+      # If the user typed "module" as the prefix use "root" since that is what is written to state
+      # (not the module.NAME target format used for plans/applies).
+      module_path[0] = 'root' if module_path[0] == 'module'
+      module_state = tfstate.fetch('modules').find { |mod| mod['path'] == module_path }
+      unless module_state
+        warn "No module found with path #{module_path} defined in #{options[:state]}."
+        exit 1
+      end
+      tf_resources = module_state.fetch('resources')
+
+      init_cloud
+      stack = @cloud.stacks.fetch(stack_name)
+      stack.template.all_resources.each do |name, resource|
+        # Skip over this convection Resource unless it maps to a function permission.
+        next unless resource.type == 'AWS::Lambda::Permission'
+
+        # Get the function and permission resource summaries.
+        permission_resource_summary = stack.resources[name]
+        function_resource_summary = stack.resources[name.sub(/Permission.*$/, 'Lambda')]
+        unless permission_resource_summary && function_resource_summary
+          warn 'ERROR: Either the lambda permission or function you were trying to import have not been created in cloudformation. These resources are expected to exist in the same template.'
+          exit 1
+        end
+
+        # Skip creation of state if state for this permission already exists.
+        if tf_resources["aws_lambda_permission.#{permission_resource_summary.logical_resource_id.underscore}"]
+          warn "WARNING: Skipping resource that was found in state: aws_lambda_permission.#{permission_resource_summary.logical_resource_id.underscore}"
+          next
+        end
+
+        function_name = resource.function_name.is_a?(Hash) ? function_resource_summary.physical_resource_id : resource.function_name
+        source_logical_name = resource.source_arn.fetch('Fn::GetAtt').first
+        source_resource_summary = stack.resources[source_logical_name] && stack.resources[source_logical_name].physical_resource_id
+        source_arn = resource.source_arn.is_a?(Hash) ? source_resource_summary : resource.source_arn
+        unless source_arn
+          warn "Unable to determine source arn from #{resource.source_arn}"
+        end
+
+        tf_resources["aws_lambda_permission.#{permission_resource_summary.logical_resource_id.underscore}"] = {
+          type: 'aws_lambda_permission',
+          depends_on: [],
+          primary: {
+            id: permission_resource_summary.physical_resource_id,
+            attributes: {
+              action: resource.action,
+              function_name: function_name,
+              id: permission_resource_summary.physical_resource_id,
+              principal: resource.principal,
+              qualifer: resource.qualifer,
+              source_arn: source_arn,
+              statement_id: permission_resource_summary.physical_resource_id
+            }.reject { |_key, value| value.nil? },
+            meta: {},
+            tainted: false
+          },
+          deposed: [],
+          provider: ''
+        }
+      end
+
+      create_file state_out, JSON.pretty_generate(tfstate)
+    end
+
     # rubocop:enable Style/AsciiComments
 
     no_commands do
@@ -162,14 +244,21 @@ module Convection
       private
 
       def import_resources(_resource_name, resource)
+        empty_directory options[:output_directory] if resource.respond_to?(:to_hcl_json) || resource.respond_to?(:additional_hcl_files)
         if resource.respond_to?(:to_hcl_json)
-          empty_directory options[:output_directory]
-          destination = File.join(options[:output_directory], "#{resource.name.downcase}.tf.json")
+          destination = File.join(options[:output_directory], "#{resource.name.underscore}.tf.json")
           create_file destination, resource.to_hcl_json, force: options[:overwrite], skip: options[:skip_existing]
         else
           say "# Unable to generate terraform configuration for #{resource.class}. Define #{resource.class}#to_hcl_json to do so.", :yellow
         end
 
+        if resource.respond_to?(:additional_hcl_files)
+          resource.additional_hcl_files.each do |file, content|
+            destination = File.join(options[:output_directory], file)
+            create_file destination, content, force: options[:overwrite], skip: options[:skip_existing]
+          end
+        end
+
         if resource.respond_to?(:terraform_import_commands)
           resource.terraform_import_commands(module_path: options[:module_path]).each do |line|
             comment = line.start_with?('#')

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

@@ -24,6 +24,8 @@ module Convection
           property :network_interfaces, 'NetworkInterfaces', :type => :list
           property :block_devices, 'BlockDeviceMappings', :type => :list
           property :volumes, 'Volumes', :type => :list
+          property :ebs_optimized, 'EbsOptimized'
+          property :monitoring, 'Monitoring'
 
           # Append a network interface to network_interfaces
           def network_interface(&block)

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

@@ -14,6 +14,7 @@ module Convection
           property :principal, 'Principal'
           property :source_account, 'SourceAccount'
           property :source_arn, 'SourceArn'
+          property :qualifer, 'Qualifer'
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport