convection 2.2.10 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7c478ce35a94d9130d3d2657a092bdb5436f505
-  data.tar.gz: d5dff048c6a317a79b0b8df5743f148768e0b368
+  metadata.gz: e4f86707af23a4ea618cd13b4dd4008a23a22bbb
+  data.tar.gz: c71c29ecbb07f321eca21c86864d3a6c2f893945
 SHA512:
-  metadata.gz: 4690a2b22a2988cd38cb7ae2d8e2dceac1bdd7f0b2080d3a2a42190b2ff2ed6033733b6ddfad97e6afd44c409e92a0c5a97f8220346f62f68ca37e871f03de7f
-  data.tar.gz: 1104ceadddfcc37b30dc12804e8e65b3fd580328421788da03fd6f90a3eb5f5df0ecac2da0bafa1d1a535668c7c4ba30092365521365d0fe28d544662f61b779
+  metadata.gz: ffc9509d0c997d2cc41ce1915a8ec5128aa4b53082f1ad157e917a9b53dde285b0a0a00e5795f8fc18f53347669000c49d45ffc7fcac7ebea532722ed8221ddf
+  data.tar.gz: a3b08777d66def2af42eeba6b1815d3b5a892beab7e945ef4a8b29e29add7e3b7b7700644a2ee4f38590efe01a3c5c2d7b8de991e5425a797602e0ea38e65e1d

data/bin/convection

@@ -303,7 +303,7 @@ module Convection
         end
       end
 
-      def import_resources(_resource_name, resource)
+      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)
           destination = File.join(options[:output_directory], "#{resource.name.underscore}.tf.json")

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

@@ -8,6 +8,9 @@ module Convection
         # AWS::EC2::Instance
         ##
         class Route53RecordSet < Resource
+          TF_ASSUMED_RESOURCE_NAME = 'aws_elastic_load_balancing_load_balancer'.freeze
+          TF_ACTUAL_RESOURCE_NAME = 'aws_elb'.freeze
+
           type 'AWS::Route53::RecordSet', :route53_recordset
           property :alias_tgt, 'AliasTarget'
           property :comment, 'Comment'
@@ -49,6 +52,43 @@ module Convection
               properties['GeoLocation'].set(g)
             end
           end
+
+          def terraform_import_commands(module_path: 'root')
+            commands = []
+            commands << '# Import the Route53 record:'
+            tf_set_id = "_#{set_identifier}" if set_identifier
+            prefix = "#{module_path}." unless module_path == 'root'
+            tf_record_name = record_name.sub(/\.$/, '')
+            commands << "terraform import #{prefix}aws_route53_record.#{name.underscore} #{hosted_zone_id}_#{tf_record_name}_#{record_type}#{tf_set_id}"
+
+            commands.map { |cmd| cmd.gsub(stack.region, stack._original_region).gsub(stack.cloud, stack._original_cloud) }
+          end
+
+          def to_hcl_json(*)
+            tf_record_attrs = {
+              zone_id: hosted_zone_id,
+              name: record_name,
+              type: record_type,
+              ttl: ttl,
+              records: tf_records,
+              set_identifier: set_identifier
+            }
+            tf_record_attrs.reject! { |_k, v| v.nil? }
+
+            tf_record = {
+              aws_route53_record: {
+                name.underscore => tf_record_attrs
+              }
+            }
+
+            { resource: [tf_record] }.to_json
+          end
+
+          private
+
+          def tf_records
+            record.map { |r| r.gsub(TF_ASSUMED_RESOURCE_NAME, TF_ACTUAL_RESOURCE_NAME) }
+          end
         end
       end
     end

metadata

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