convection 2.2.9 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 885a2657be20ba62b8093c5e9a1a40ba1e07d00a
-  data.tar.gz: ef6fa45e59e1f5c5cb638a25aee3d988d6e8df84
+  metadata.gz: f7c478ce35a94d9130d3d2657a092bdb5436f505
+  data.tar.gz: d5dff048c6a317a79b0b8df5743f148768e0b368
 SHA512:
-  metadata.gz: bfb48a30b72cfd48182128f4844ffa1545135b197366777b517ed4c7273068324252427e268268c37c593b444cb50420c01b92fc7bcc07fc710c0d6c963ce708
-  data.tar.gz: 857133927e3ca14e847c663c93523073595514e03116c830a02b5cf24c6a821224569f26fe6a849233ee2104e5989053506acc45378d29bef90f6c177810c22c
+  metadata.gz: 4690a2b22a2988cd38cb7ae2d8e2dceac1bdd7f0b2080d3a2a42190b2ff2ed6033733b6ddfad97e6afd44c409e92a0c5a97f8220346f62f68ca37e871f03de7f
+  data.tar.gz: 1104ceadddfcc37b30dc12804e8e65b3fd580328421788da03fd6f90a3eb5f5df0ecac2da0bafa1d1a535668c7c4ba30092365521365d0fe28d544662f61b779

data/bin/convection

@@ -13,6 +13,7 @@ module Convection
     include Thor::Actions
 
     DEFAULT_MODULE_PATH = 'root'.freeze
+    S3_URI_REGEX = %r(^s3://(?<bucket>[^/]+)/(?<key>.+)).freeze
 
     def initialize(*args)
       super
@@ -119,6 +120,38 @@ module Convection
       describe_stack_resources(options[:stack], options[:format], options[:properties], options[:type])
     end
 
+    desc 'terraForm-compare-resources', 'Compare resources in CloudFormation and in terraform state'
+    option :stack_name, desc: 'The CloudFormation stack name (Stack#cloud_name)'
+    option :stack_region, desc: 'The region where the stack resides', required: true
+    option :state, desc: 'The source terraform state file (can be an s3:// uri)', required: true
+    option :state_region, desc: 'The region where the state resides (required to load remote state)'
+    def terraform_compare_resources
+      terraform_resources = tfstate['modules'].flat_map { |m|
+        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.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
+        else
+          say "  * Unable to find physical ID in the provided Terraform state.", :red
+        end
+      end
+    end
+
     # rubocop:disable Style/AsciiComments
 
     desc 'terraform-export STACK', 'Create terraform configuration for a given stack (including `terraform import` commands)'
@@ -140,7 +173,8 @@ module Convection
       end
 
       init_cloud
-      template = @cloud.stacks.fetch(stack_name).template
+      @stack = @cloud.stacks.fetch(stack_name)
+      template = @stack.template
 
       # Beware of 🐲. This patches this instance to include terraform compatible intrinsic functions where possible.
       #
@@ -243,6 +277,32 @@ module Convection
 
       private
 
+      def load_local_terraform_state(statefile)
+        JSON.load(File.open(statefile))
+      end
+
+      def load_remote_terraform_state(bucket, key)
+        unless options[:state_region] && !options[:state_region].empty?
+          say 'ERROR: --state-region must be specified to load remote state.', :red
+          exit 1
+        end
+
+        s3 = Aws::S3::Client.new(region: options[:state_region])
+        object = s3.get_object(bucket: bucket, key: key)
+        JSON.load(object.body)
+      end
+
+      def tfstate
+        return @tfstate if @tfstate
+
+        match_data = options[:state].match(S3_URI_REGEX)
+        if match_data
+          @tfstate = load_remote_terraform_state(match_data['bucket'], match_data['key'])
+        else
+          @tfstate = load_local_terraform_state(options[:state])
+        end
+      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)
@@ -263,7 +323,9 @@ module Convection
         end
 
         if resource.respond_to?(:terraform_import_commands)
-          resource.terraform_import_commands(module_path: options[:module_path]).each do |line|
+          destination = File.join(options[:output_directory], "terraform-import-#{resource_name.underscore}-#{@stack._original_region}-#{@stack._original_cloud}.sh")
+          lines = resource.terraform_import_commands(module_path: options[:module_path])
+          lines.each do |line|
             comment = line.start_with?('#')
             if options[:omit_comments]
               next if comment || line.strip.empty?
@@ -272,6 +334,7 @@ module Convection
             color = comment ? :bold : :cyan
             say line, color
           end
+          create_file destination, lines.join("\n")
         else
           say "# Unable to determine terraform import commands for #{resource.class}. Define #{resource.class}#terraform_import_commands to do so.", :yellow
         end

metadata

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