convection 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea262d5b5afd735ba927d096ad928f509ba36ebf
-  data.tar.gz: 3c44b95e767817b022dcb7ed20dfbfa413882366
+  metadata.gz: 1cc9a19505a82416b030b023c4a0c26b1fed5ba7
+  data.tar.gz: 52199f6b587c4407aa1343933044cb58e5c1aac7
 SHA512:
-  metadata.gz: 3ac71c23b2062b707a5caafceb973de58ccc4ba32436373f6a26ee14ea49350d19078f6de1bc959d0280477412a63db8e03a7de9b53ddfa175cdc0c8d4dc52ab
-  data.tar.gz: c2a5cae44fda5935f59c4dea52486ddfc4371b4fe1ad1e294bd3d39f2cdaaab7ff833007e1a492fc8cb0891acc358d9feefffabf5a431b75bbbfcc7c2d30789a
+  metadata.gz: d1f432b877726684a99488e7774312f7c038e34248d40d315fb163ecbada1924766c934318d1da23c115432c02f0bb2c8e96ee1784db31768381ee739c657f0f
+  data.tar.gz: 40ab46a04114fe749a3ac5dc026b69512e9ab8e215b812356a81860323256be9d19ceeae7ec6d47afa46149a0e4622ee0f52205a9016c10bfac0bf7b5275bfcc

data/.rubocop.yml

@@ -24,14 +24,16 @@ Performance/RedundantBlockCall:
 Style/SignalException:
   Enabled: false
 
+Metrics/LineLength:
+  Exclude:
+    - 'lib/convection/dsl/terraform_intrinsic_functions.rb'
+
 # AbcSize:
 #   Max: 24
 # ClassLength:
 #   Max: 256
 # CyclomaticComplexity:
 #   Max: 12
-# LineLength:
-#   Max: 120
 # MethodLength:
 #   Max: 32
 # PerceivedComplexity:

data/bin/convection

@@ -140,13 +140,13 @@ module Convection
 
       init_cloud
       template = @cloud.stacks.fetch(stack_name).template
-      # Beware of 🐲. This patches this Template to include terraform compatible intrinsic functions where possible.
+
+      # Beware of 🐲. This patches this instance to include terraform compatible intrinsic functions where possible.
       #
       # This should only be done in single threaded environment in the terraform-export command as it breaks usage of cloudformation psuedo-functions.
-      #
-      # e.g. #get_att("Bucket", "Arn") returns "aws_s3_bucket.bucket.arn" instead of { "Fn::GetAtt" => ["Bucket", "Arn"] }.
       require 'convection/dsl/terraform_intrinsic_functions'
-      template.extend(Convection::DSL::TerraformIntrinsicFunctions)
+      Convection::DSL::TerraformIntrinsicFunctions.overload(Convection::DSL::IntrinsicFunctions.mixers)
+
       template.resource_collections.each(&method(:import_resources))
       template.resources.each(&method(:import_resources))
     end
@@ -158,14 +158,9 @@ module Convection
 
       private
 
-      # rubocop:disable Style/AsciiComments
-
       def import_resources(_resource_name, resource)
-        # Beware of 🐲. This patches this instance to include terraform compatible intrinsic functions where possible.
-        #
-        # This should only be done in single threaded environment in the terraform-export command as it breaks usage of cloudformation psuedo-functions.
-        require 'convection/dsl/terraform_intrinsic_functions'
-        resource.extend(Convection::DSL::TerraformIntrinsicFunctions)
+        # Reload this resource to ensure configuration is up to date. Amazon psuedo functions will have changed their return values.
+        resource.execute
 
         if resource.respond_to?(:to_hcl_json)
           empty_directory options[:output_directory]
@@ -192,8 +187,6 @@ module Convection
         puts # Print an additional new line
       end
 
-      # rubocop:enable Style/AsciiComments
-
       def operation(task_name, stack)
         work_q = Queue.new
         semaphore = Mutex.new

data/lib/convection/dsl/helpers.rb

@@ -35,6 +35,8 @@ module Convection
 
       class << self
         def included(mod)
+          DSL::IntrinsicFunctions.mixers << mod
+
           mod.extend(DSL::ClassHelpers)
         end
 

data/lib/convection/dsl/intrinsic_functions.rb

@@ -1,8 +1,20 @@
+require 'set'
+
 module Convection
   module DSL
     ##
     # Formatting helpers for Intrinsic Functions
     module IntrinsicFunctions
+      def self.included(base)
+        mixers << base
+
+        super
+      end
+
+      def self.mixers
+        @mixers ||= Set.new
+      end
+
       def base64(content)
         {
           'Fn::Base64' => content

data/lib/convection/dsl/terraform_intrinsic_functions.rb

@@ -1,81 +1,101 @@
-require 'active_support/core_ext/string/inflections'
-
 module Convection
   module DSL
+    # AWS psuedo-functions overridden to be terraform compatible, sort of!
     module TerraformIntrinsicFunctions
+      # Lazily require inflections so loaded when invoking terraform-export.
+      require 'active_support/core_ext/string/inflections'
+
+      def self.extended(base)
+        return base.include(self) if base.is_a?(Class) || base.is_a?(Module)
+
+        super
+      end
+
+      def self.overload(objects)
+        mod = self
+        objects.each { |o| o.extend(mod) }
+      end
+
       def base64(_content)
         %q(base64(#{content.to_json}))
       end
 
       def fn_and(*)
-        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{name})"
+        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{terraform_name})"
         '${todo.fn_and.ATTRIBUTE.set_in_count}'
       end
 
       def fn_equals(*)
-        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{name})"
+        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{terraform_name})"
         '${todo.fn_equals.ATTRIBUTE.set_in_count}'
       end
 
       def fn_if(*)
-        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{name})"
+        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{terraform_name})"
         '${todo.fn_if.ATTRIBUTE.set_in_count}'
       end
 
       def fn_import_value(*)
-        warn "WARNING: Fn::ImportValue cannot be inferred when migrated to terraform. Please pull in this input through a variable or local value in your configuration. #{self.class}(#{name})"
+        warn "WARNING: Fn::ImportValue cannot be inferred when migrated to terraform. Please pull in this input through a variable or local value in your configuration. #{self.class}(#{terraform_name})"
         '${todo.fn_import_value.ATTRIBUTE}'
       end
 
       def fn_not(*)
-        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{name})"
+        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{terraform_name})"
         '${todo.fn_not.ATTRIBUTE.set_in_count}'
       end
 
       def fn_or(*)
-        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{name})"
+        warn "WARNING: Condition functions cannot be inferred when migrating to terraform. Please set count on migrated resources manually. #{self.class}(#{terraform_name})"
         '${todo.fn_or.ATTRIBUTE.set_in_count}'
       end
 
       def fn_sub(*)
-        warn "WARNING: Fn::Sub cannot be inferred when migrating to terraform. Please use ${replace(str, search, replace)} instead. #{self.class}(#{name})"
+        warn "WARNING: Fn::Sub cannot be inferred when migrating to terraform. Please use ${replace(str, search, replace)} instead. #{self.class}(#{terraform_name})"
         '${replace(todo.fn_sub.STRING, todo.fn_sub.SEARCH, todo.fn_sub.REPLACE)}'
       end
 
       def find_in_map(*)
-        warn "WARNING: Fn::FindInMap cannot be inferred when migrating to terraform. Please consult with the interpolation syntax terraform docs #{self.class}(#{name})"
+        warn "WARNING: Fn::FindInMap cannot be inferred when migrating to terraform. Please consult with the interpolation syntax terraform docs #{self.class}(#{terraform_name})"
         '${lookup(lookup(YOUR_MAP, YOUR_TOP_LEVEL_KEY), YOUR_NESTED_KEY)}'
       end
 
       def get_att(resource_name, attr_name)
         interpolation_string = "${#{terraform_resource_type(resource_name)}.#{terraform_resource_name(resource_name)}.#{attr_name.underscore}}"
-        warn "WARNING: Inferring you want to use #{interpolation_string} in place of Fn::GetAtt. Please consult with the interpolation syntax terraform docs and docs for this resource type in terraform to verify compatablity. #{self.class}(#{name})"
+        warn "WARNING: Inferring you want to use #{interpolation_string} in place of Fn::GetAtt. Please consult with the interpolation syntax terraform docs and docs for this resource type in terraform to verify compatablity. #{self.class}(#{terraform_name})"
         interpolation_string
       end
 
       def get_azs(*)
-        warn "WARNING: Inferring you want to use ${var.availability_zones} instead of Fn::GetAZs. Please consult with the interpolation syntax terraform docs to verify compatablity. Additionally you should attempt to use variables in place of a literal list. #{self.class}(#{name})"
+        warn "WARNING: Inferring you want to use ${var.availability_zones} instead of Fn::GetAZs. Please consult with the interpolation syntax terraform docs to verify compatablity. Additionally you should attempt to use variables in place of a literal list. #{self.class}(#{terraform_name})"
         '${var.availability_zones}'
       end
 
       def join(delimiter, *values)
         interpolation_string = "${join(\"#{delimiter}\", list(#{values.map { |o| "\"#{o}\"" }.join(', ')}))"
-        warn "WARNING: Inferring you want to use #{interpolation_string} in place of Fn::Join. Please consult with the interpolation syntax terraform docs to verify compatablity. Additionally you should attempt to use variables in place of a literal list. #{self.class}(#{name})"
+        warn "WARNING: Inferring you want to use #{interpolation_string} in place of Fn::Join. Please consult with the interpolation syntax terraform docs to verify compatablity. Additionally you should attempt to use variables in place of a literal list. #{self.class}(#{terraform_name})"
         interpolation_string
       end
 
       def select(index, *objects)
         interpolation_string = "${element(list(#{objects.map { |o| "\"#{o}\"" }.join(', ')}), #{index})"
-        warn "WARNING: Inferring you want to use #{interpolation_string} in place of Fn::Select. Please consult with the interpolation syntax terraform docs to verify compatablity. Additionally you should attempt to use variables in place of a literal list. #{self.class}(#{name})"
+        warn "WARNING: Inferring you want to use #{interpolation_string} in place of Fn::Select. Please consult with the interpolation syntax terraform docs to verify compatablity. Additionally you should attempt to use variables in place of a literal list. #{self.class}(#{terraform_name})"
         interpolation_string
       end
 
       def fn_ref(resource_name)
         interpolation_string = "${#{terraform_resource_type(resource_name)}.#{terraform_resource_name(resource_name)}.id}"
-        warn "WARNING: Inferring you want to use #{interpolation_string} in place of Fn::Ref. Please consult with the interpolation syntax terraform docs and docs for this resource type in terraform to verify compatablity. #{self.class}(#{name})"
+        warn "WARNING: Inferring you want to use #{interpolation_string} in place of Fn::Ref. Please consult with the interpolation syntax terraform docs and docs for this resource type in terraform to verify compatablity. #{self.class}(#{terraform_name})"
         interpolation_string
       end
 
+      def terraform_name
+        return name if respond_to?(:name)
+        return sid if respond_to?(:sid)
+
+        object_id
+      end
+
       def terraform_resource_name(resource_name)
         resource_name.underscore
       end

metadata

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