convection 2.2.12 → 2.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06fa6942996ee32f586741975300cad7ddd11e83
-  data.tar.gz: f393211f45deac206370eaa9c5c7163547b563da
+  metadata.gz: cc4c4bbe225ec33757f900d24c62f5629644e4ae
+  data.tar.gz: b3e00e9748782113a6a7491cacb12cdc0b2f71e0
 SHA512:
-  metadata.gz: '0801e86aef339edd14e256942d10c641ade985171fca98f15db341a0ef18652230cb0a8c9762dda1f048a68ac47f27164cf08bcbba7397a4fd1aa8ffeac885f7'
-  data.tar.gz: d110b282f788d2479e8984f3117ed339244019ea51efaa284be93bee0cc021967b07357ff172bb5ba82c4b7d9a113c83147d4cc53b55e3f7aa9a8b38e1149057
+  metadata.gz: 731c78af0486d452e249a27c40499bbe4d44d44df7a5fd35c7501c6104ddb4720ccdf60b870574f2b3808510a85870530351e241a20aa6167fe712116a21d09f
+  data.tar.gz: 88af87c51fa62ca1be9e73748d90abfe9a0bbb63b0946d028fe3a5a2ae01eb218b6285ae4145faf4fb40acac07cf2cfb864697dad6678a7e156679a6529bc653

data/bin/convection

@@ -130,22 +130,19 @@ module Convection
         m['resources'].reject { |k, _| k.start_with?('data.') }
       }.reduce({}, &:merge)
       cf = Aws::CloudFormation::Client.new(region: options[:stack_region])
-      cf_resources = cf.describe_stack_resources(stack_name: options[:stack_name]).stack_resources
+      cf_resources = cf.describe_stack_resources(stack_name: options[:stack_name]).stack_resources.map do |r|
+        { logical_resource_id: r.logical_resource_id, physical_resource_id: r.physical_resource_id, type: r.resource_type }
+      end
       cf_resources.each do |cf_resource|
-        say "Resource '#{cf_resource.physical_resource_id}':"
-        say "  * CloudFormation Logical ID #{cf_resource.logical_resource_id}"
-
-        tf_resource_name, tf_resource = terraform_resources.find do |_, tf_resource|
-          next true if tf_resource['primary'].key(cf_resource.physical_resource_id)
-          tf_resource['primary'].values.any? { |v| v.is_a?(String) && v.include?(cf_resource.physical_resource_id) }
-        end
-        tf_key = tf_resource && tf_resource['primary'].key(cf_resource.physical_resource_id)
-        fuzzy_match = tf_key.nil?
-        tf_key ||= tf_resource && tf_resource['primary'].find { |v| v.include?(cf_resource.physical_resource_id) }
-        if tf_key && fuzzy_match
-          say "  * Found physical ID included in Terraform resource #{tf_resource_name} under attribute #{tf_key} with value '#{tf_resource['primary'][tf_key]}'. Please validate this resource is included in state and configuration.", :yellow
-        elsif tf_key && !fuzzy_match
-          say "  * Found physical ID exactly in Terraform resource #{tf_resource_name} under attribute #{tf_key} with value '#{tf_resource['primary'][tf_key]}'.", :cyan
+        response = ask_tf_physical_id(cf_resource)
+        cf_resource[:physical_resource_id] = response unless response.empty?
+        say "Resource #{cf_resource[:physical_resource_id].inspect} #{cf_resource[:logical_resource_id].inspect}:"
+
+        tf_resource = tf_resource_for(physical_resource_id: cf_resource[:physical_resource_id], resources: terraform_resources)
+        if tf_resource[:attribute_key] && tf_resource[:partial]
+          say "  * Found physical ID included in Terraform resource #{tf_resource[:logical_resource_id].inspect} under attribute #{tf_resource[:attribute_key].inspect} with value #{tf_resource[:value].inspect}. Please validate this resource is included in state and configuration.", :yellow
+        elsif tf_resource[:attribute_key] && !tf_resource[:partial]
+          say "  * Found physical ID exactly in Terraform resource #{tf_resource[:logical_resource_id].inspect} under attribute #{tf_resource[:attribute_key].inspect} with value #{tf_resource[:value].inspect}.", :green
         else
           say "  * Unable to find physical ID in the provided Terraform state.", :red
         end
@@ -280,6 +277,18 @@ module Convection
 
       private
 
+      def ask_tf_physical_id(cf_resource)
+        question = case cf_resource[:type]
+                   when 'AWS::IAM::Policy'
+                     "What is the <role-name>:<policy-name> for the #{cf_resource[:logical_resource_id].inspect} IAM policy?"
+                   when 'AWS::S3::BucketPolicy'
+                     "What is the name of the bucket that the #{cf_resource[:logical_resource_id].inspect} policy belongs to?"
+                   end
+        return '' unless question
+
+        ask(question, :yellow).chomp
+      end
+
       def load_local_terraform_state(statefile)
         JSON.load(File.open(statefile))
       end
@@ -306,6 +315,20 @@ module Convection
         end
       end
 
+      def tf_resource_for(physical_resource_id:, resources:)
+        logical_id, resource = resources.find do |_, resource|
+          next true if resource['primary'].key(physical_resource_id)
+          resource['primary'].values.any? { |v| v.is_a?(String) && v.include?(physical_resource_id) }
+        end
+        return {} unless logical_id && resource
+
+        key = resource['primary'].key(physical_resource_id)
+        return { attribute_key: key, logical_id: logical_id, partial: false, value: physical_resource_id } if key
+
+        key, value = value['primary'].find { |v| v.include?(physical_resource_id) }
+        return { attribute_key: key, logical_id: logical_id, partial: true, value: value }
+      end
+
       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)

data/lib/convection/model/template.rb

@@ -41,6 +41,22 @@ module Convection
             @resource_collection_dsl_methods ||= {}
           end
         end
+
+        def _terraform_module_dir_to_flag(dir)
+          return 'root' if dir.empty?
+
+          parts = dir.split('/')
+          parts[0] = 'module' if parts[0] == 'modules'
+          parts.join('.')
+        end
+
+        def _terraform_module_flag_to_dir(flag)
+          return '' if flag == 'root'
+
+          parts = flag.split('.')
+          parts[0] = 'modules'
+          parts.join('/')
+        end
       end
 
       include DSL::Helpers

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

@@ -116,6 +116,58 @@ module Convection
               render_tags(resource)
             end
           end
+
+          def to_hcl_json(*)
+            tf_sg_name = name.underscore
+            tf_sg_var_id = "${aws_security_group.#{tf_sg_name}.id}"
+            tf_resources = []
+
+            # Define the security group resource.
+            tf_resources << {
+              aws_security_group: {
+                tf_sg_name => {
+                  vpc_id: vpc,
+                  description: description,
+                  tags: tags.reject { |_, v| v.nil? }
+                }.reject { |_, v| v.nil? }
+              }
+            }
+
+            tf_sg_rules = {}
+
+            # Define helper functions to map Convection rules to Terraform ones.
+            sg_rule_to_tf = lambda do |rule_type, item, index|
+              tf_sg_rule_name = "#{tf_sg_name}_#{rule_type}_#{index}"
+
+              tf_sg_rules[tf_sg_rule_name] = {
+                type: rule_type,
+                security_group_id: tf_sg_var_id,
+                from_port: item.from,
+                to_port: item.to,
+                protocol: item.protocol,
+                cidr_block: item.source,
+                # TODO: Missing attribs & checks. Should probably be defined as a
+                #       seperate function to reuse for egress.
+              }.reject { |_, v| v.nil? }
+            end
+
+            # Map the contained rules to TF.
+            security_group_ingress.each_with_index { |item, obj| sg_rule_to_tf.call('ingress', item, obj) }
+            security_group_egress.each_with_index { |item, obj| sg_rule_to_tf.call('egress', item, obj) }
+
+            tf_resources << { aws_security_group_rule: tf_sg_rules }
+
+            # Return the JSON representation of this resource.
+            { resource: tf_resources }.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 security group:']
+            commands << "terraform import #{prefix}aws_security_group.#{name.underscore} #{resource_id}"
+            commands
+          end
         end
       end
     end

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

@@ -63,6 +63,61 @@ module Convection
           property :path, 'Path'
           property :policies, 'Policies', :type => :list
           property :user_name, 'UserName'
+
+          def additional_hcl_files(module_path: 'root')
+            module_prefix = module_path.tr('.', '-') if module_path == 'root'
+            result = {}
+
+            user = user_name
+            user ||= stack.resources[name] && stack.resources[name].physical_resource_id
+            result["#{stack._original_region}-#{stack._original_cloud}-#{name.underscore}.tf.json"] = {
+              module: [{
+                name.underscore => {
+                  source: _terraform_module_flag_to_dir(module_path),
+                  managed_policy_arns: managed_policy_arn,
+                  name: user,
+                  path: path
+                }
+              }]
+            }
+
+            result["#{module_prefix}#{name.underscore}-variables.tf.json"] = {
+              variable: [
+                { managed_policy_arns: { description: 'A list of ARNs for managed policies to attach to this user.', default: [] } },
+                { name: { description: 'The name of the user' } },
+                { path: { description: 'The path for the IAM user', path: '/' } }
+              ]
+            }
+
+            result["#{module_prefix}#{name.underscore}-user.tf.json"] = {
+              resource: [
+                {
+                  aws_iam_user: {
+                    name.underscore => {
+                      managed_policy_arns: '${var.managed_policy_arns}',
+                      name: '${var.name}',
+                      path: '${var.path}'
+                    }
+                  }
+                }
+              ]
+            }
+
+            policy_resources = policies.map do |policy|
+              {
+                aws_iam_user_policy: {
+                  policy.name.underscore => {
+                    name: policy.name,
+                    policy: policy.render.to_json,
+                    user: "${aws_iam_user.#{name.underscore}.id}"
+                  }
+                }
+              }
+            end
+            result["#{module_prefix}#{name.underscore}-policy.tf.json"] = { resource: policy_resources }
+
+            result
+          end
         end
       end
     end

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

@@ -50,6 +50,30 @@ module Convection
             properties['WebsiteConfiguration'].set(config)
           end
 
+          def terraform_import_commands(module_path: 'root')
+            commands = ['# Run the following commands to import your infrastructure into terraform management.', '# ensure :module_path is set correctly', '']
+            module_prefix = "#{module_path}." unless module_path == 'root'
+
+            commands << '# Import s3 bucket and s3 bucket policy: '
+            commands << "terraform import #{module_prefix}aws_s3_bucket.#{name.underscore} #{stack.resources[name].physical_resource_id}"
+            commands << ''
+            commands
+          end
+
+          def to_hcl_json(*)
+            bucket_resource = {
+              name.underscore => {
+                bucket: stack.resources[name].physical_resource_id,
+                acl: 'private',
+                force_destroy: false
+              }
+            }
+
+            data = [{ aws_region: { current: { current: true } } }]
+            vars = [{ cloud: { description: 'The cloud name for this resource.' } }]
+            { resource: [{ aws_s3_bucket: bucket_resource }], data: data, variable: vars }.to_json
+          end
+
           def render(*args)
             super.tap do |resource|
               render_tags(resource)

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

@@ -30,6 +30,28 @@ module Convection
             @document = Model::Mixin::Policy.new(:name => false, :template => @template)
           end
 
+          def terraform_import_commands(*)
+            commands = ['# Run the following commands to import your infrastructure into terraform management.', '# ensure :module_path is set correctly', '']
+            commands << '# Import s3 bucket and s3 bucket policy: '
+            # commands << "terraform import #{module_prefix}aws_s3_bucket.#{name.underscore} #{stack.resources[name].physical_resource_id}"
+            commands << ''
+            commands
+          end
+
+          def to_hcl_json(*)
+            policy_json = resources[name] && resources[name].document.document.to_json.gsub(stack.resources[name].physical_resource_id, bucket)
+            policy_resource = {
+              name.underscore => {
+                bucket: bucket,
+                policy: policy_json
+              }
+            }
+
+            data = [{ aws_region: { current: { current: true } } }]
+            vars = [{ cloud: { description: 'The cloud name for this resource.' } }]
+            { resource: { aws_s3_bucket_policy: policy_resource }, data: data, variable: vars }.to_json
+          end
+
           def render
             super.tap do |r|
               document.render(r['Properties'])

metadata

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