convection 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4f86707af23a4ea618cd13b4dd4008a23a22bbb
-  data.tar.gz: c71c29ecbb07f321eca21c86864d3a6c2f893945
+  metadata.gz: 06fa6942996ee32f586741975300cad7ddd11e83
+  data.tar.gz: f393211f45deac206370eaa9c5c7163547b563da
 SHA512:
-  metadata.gz: ffc9509d0c997d2cc41ce1915a8ec5128aa4b53082f1ad157e917a9b53dde285b0a0a00e5795f8fc18f53347669000c49d45ffc7fcac7ebea532722ed8221ddf
-  data.tar.gz: a3b08777d66def2af42eeba6b1815d3b5a892beab7e945ef4a8b29e29add7e3b7b7700644a2ee4f38590efe01a3c5c2d7b8de991e5425a797602e0ea38e65e1d
+  metadata.gz: '0801e86aef339edd14e256942d10c641ade985171fca98f15db341a0ef18652230cb0a8c9762dda1f048a68ac47f27164cf08bcbba7397a4fd1aa8ffeac885f7'
+  data.tar.gz: d110b282f788d2479e8984f3117ed339244019ea51efaa284be93bee0cc021967b07357ff172bb5ba82c4b7d9a113c83147d4cc53b55e3f7aa9a8b38e1149057

data/bin/convection

@@ -225,7 +225,9 @@ module Convection
 
         # Get the function and permission resource summaries.
         permission_resource_summary = stack.resources[name]
-        function_resource_summary = stack.resources[name.sub(/Permission.*$/, 'Lambda')]
+	permission_resource = stack.template.resources[name]
+        lambda_resource_logical_id = lambda_resource_logical_id(permission_resource: permission_resource)
+        function_resource_summary = lambda_resource_logical_id && stack.resources[lambda_resource_logical_id]
         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
@@ -238,7 +240,7 @@ module Convection
         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_logical_name = resource.source_arn.is_a?(Hash) ? resource.source_arn.fetch('Fn::GetAtt', []).first : resource.source_arn
         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
@@ -257,6 +259,7 @@ module Convection
               principal: resource.principal,
               qualifer: resource.qualifer,
               source_arn: source_arn,
+              source_account: resource.source_account,
               statement_id: permission_resource_summary.physical_resource_id
             }.reject { |_key, value| value.nil? },
             meta: {},
@@ -342,6 +345,16 @@ module Convection
         puts # Print an additional new line
       end
 
+      def lambda_resource_logical_id(permission_resource:)
+        return nil unless permission_resource
+
+        if permission_resource.function_name.is_a?(Hash)
+          return permission_resource.function_name['Ref'] if permission_resource.function_name.key?('Ref')
+        end
+
+        permission_resource.name.sub(/Permission.*$/, 'Lambda')
+      end
+
       def operation(task_name, stack)
         work_q = Queue.new
         semaphore = Mutex.new

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

@@ -16,6 +16,32 @@ module Convection
           property :instance, 'InstanceId'
           property :interface, 'NetworkInterfaceId'
           property :peer, 'VpcPeeringConnectionId'
+
+          def to_hcl_json(*)
+            tf_record_attrs = {
+              route_table_id: route_table_id,
+              destination_cidr_block: destination,
+              vpc_peering_connection_id: peer,
+              gateway_id: gateway,
+              nat_gateway_id: nat_gateway,
+              instance_id: instance,
+              network_interface_id: interface
+            }
+
+            tf_record_attrs.reject! { |_, v| v.nil? }
+
+            tf_record = {
+              aws_route: {
+                name.underscore => tf_record_attrs
+              }
+            }
+
+            { resource: tf_record }.to_json
+          end
+
+          def terraform_import_commands(*)
+            ['# Route import is not supported by Terraform.']
+          end
         end
       end
     end

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

@@ -38,6 +38,33 @@ module Convection
               render_tags(resource)
             end
           end
+
+          def to_hcl_json(*)
+            tf_record_tags = tags.reject { |_, v| v.nil? }
+
+            tf_record_attrs = {
+              vpc_id: vpc,
+              tags: tf_record_tags
+            }
+
+            tf_record_attrs.reject! { |_, v| v.nil? }
+
+            tf_record = {
+              aws_route_table: {
+                name.underscore => tf_record_attrs
+              }
+            }
+
+            { resource: tf_record }.to_json
+          end
+
+          def terraform_import_commands(module_path: 'root')
+            prefix = "#{module_path}." unless module_path == 'root'
+            resource_id = stack.resources[name] && stack.resources[name].physical_resource_id
+            commands = ['# Import the Route Table record:']
+            commands << "terraform import #{prefix}aws_route_table.#{name.underscore} #{resource_id}"
+            commands
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.12
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport