terraforming 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 732437685979fbd266b3f855c81ffb184be35856
-  data.tar.gz: 5f3ef26d21cab520886d5a4ebff23e2af13d5b03
+  metadata.gz: 3a6da3b6025e72dbde110224ba597ae281004e64
+  data.tar.gz: a8ab14e29325070270895d2bd7d9dfc1f456bb64
 SHA512:
-  metadata.gz: c564d548f74b3650cf1509388cafd66bc831e705f16c881f05aa8cf5507aa93e35106f15eb5b0f74f77cbacae9f342508751417219e3ae009c94339806d6cd72
-  data.tar.gz: e451f2a2619e7cad7658fbfc33155fe948edb7e583fb2f4cb914b3b16d9a4dd6a444b98d08ec2301a56cb28bb876aebd2c454bb5797cbbfff864b9fa2e8d69f6
+  metadata.gz: 7611a6cc8554f7661ff3c579306becffc4da9ed077e8087b7c1e68e57b14eed25cbdb7d1e8d342fd4c547daf1c1788ed9ec30b22c4eba19c46d66458d8bfbc67
+  data.tar.gz: 8435e655557d88686a783ae7045a0ecd8a5deb10514be0645372caf92eb7855f49024b10294be8faeb78caaf6d49be1f18b39009c6d2997611fcfd205de4c1ec

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [v0.1.2](https://github.com/dtan4/terraforming/releases/tag/v0.1.2) (2015-07-30)
+
+## Fixed
+
+- Generate correct tf and tfstate of EC2 #94, #102
+- Handle multiple Route53 record types #99 (thanks @nicgrayson)
+- Generate correct tfstate of ELB #91 (thanks @grosendorf)
+
 # [v0.1.1](https://github.com/dtan4/terraforming/releases/tag/v0.1.1) (2015-07-14)
 
 ### Resource

data/README.md

@@ -60,8 +60,11 @@ Commands:
   terraforming dbsg            # Database Security Group
   terraforming dbsn            # Database Subnet Group
   terraforming ec2             # EC2
+  terraforming ecc             # ElastiCache Cluster
+  terraforming ecsn            # ElastiCache Subnet Group
   terraforming elb             # ELB
   terraforming iamg            # IAM Group
+  terraforming iamgm           # IAM Group Membership
   terraforming iamgp           # IAM Group Policy
   terraforming iamip           # IAM Instance Profile
   terraforming iamp            # IAM Policy

data/lib/terraforming/resource/ec2.rb

@@ -21,25 +21,31 @@ module Terraforming
 
       def tfstate(tfstate_base)
         resources = instances.inject({}) do |result, instance|
+          in_vpc = in_vpc?(instance)
+          block_devices = block_devices_of(instance)
+
           attributes = {
             "ami"=> instance.image_id,
             "associate_public_ip_address"=> "true",
             "availability_zone"=> instance.placement.availability_zone,
-            "ebs_block_device.#"=> instance.block_device_mappings.length.to_s,
+            "ebs_block_device.#"=> ebs_block_devices_in(block_devices, instance).length.to_s,
             "ebs_optimized"=> instance.ebs_optimized.to_s,
-            "ephemeral_block_device.#"=> "0",
+            "ephemeral_block_device.#" => "0", # Terraform 0.6.1 cannot fetch this field from AWS
             "id"=> instance.instance_id,
             "instance_type"=> instance.instance_type,
             "private_dns"=> instance.private_dns_name,
             "private_ip"=> instance.private_ip_address,
             "public_dns"=> instance.public_dns_name,
             "public_ip"=> instance.public_ip_address,
-            "root_block_device.#"=> instance.root_device_name ? "1" : "0",
-            "security_groups.#"=> instance.security_groups.length.to_s,
+            "root_block_device.#"=> root_block_devices_in(block_devices, instance).length.to_s,
+            "security_groups.#"=> in_vpc ? "0" : instance.security_groups.length.to_s,
             "source_dest_check"=> instance.source_dest_check.to_s,
-            "subnet_id"=> instance.subnet_id,
-            "tenancy"=> instance.placement.tenancy
+            "tenancy"=> instance.placement.tenancy,
+            "vpc_security_group_ids.#"=> in_vpc ? instance.security_groups.length.to_s : "0",
           }
+
+          attributes["subnet_id"] = instance.subnet_id if in_vpc?(instance)
+
           result["aws_instance.#{module_name_of(instance)}"] = {
             "type" => "aws_instance",
             "primary" => {
@@ -59,13 +65,53 @@ module Terraforming
 
       private
 
+      def block_device_ids_of(instance)
+        instance.block_device_mappings.map { |bdm| bdm.ebs.volume_id }
+      end
+
+      def block_devices_of(instance)
+        @client.describe_volumes(volume_ids: block_device_ids_of(instance)).volumes
+      end
+
+      def block_device_mapping_of(instance, volume_id)
+        instance.block_device_mappings.select { |bdm| bdm.ebs.volume_id == volume_id }[0]
+      end
+
+      def ebs_block_devices_in(block_devices, instance)
+        block_devices.reject do |bd|
+          root_block_device?(block_device_mapping_of(instance, bd.volume_id), instance)
+        end
+      end
+
+      #
+      # NOTE(dtan4):
+      #   Original logic is here:
+      #     https://github.com/hashicorp/terraform/blob/281e4d3e67f66daab9cdb1f7c8b6f602d949e5ee/builtin/providers/aws/resource_aws_instance.go#L481-L501
+      #
+      def in_vpc?(instance)
+        vpc_security_groups_of(instance).length > 0 ||
+          (instance.subnet_id && instance.subnet_id != "" && instance.security_groups.length == 0)
+      end
+
       def instances
-        @client.describe_instances.reservations.map(&:instances).flatten
+        @client.describe_instances.reservations.map(&:instances).flatten.reject { |instance| instance.state.name == "terminated" }
       end
 
       def module_name_of(instance)
         normalize_module_name(name_from_tag(instance, instance.instance_id))
       end
+
+      def root_block_device?(block_device_mapping, instance)
+        block_device_mapping.device_name == instance.root_device_name
+      end
+
+      def root_block_devices_in(block_devices, instance)
+        block_devices.select { |bd| root_block_device?(block_device_mapping_of(instance, bd.volume_id), instance) }
+      end
+
+      def vpc_security_groups_of(instance)
+        instance.security_groups.select { |security_group| /\Asg-/ =~ security_group.group_id }
+      end
     end
   end
 end

data/lib/terraforming/resource/elb.rb

@@ -28,16 +28,21 @@ module Terraforming
             "connection_draining_timeout" => load_balancer_attributes.connection_draining.timeout.to_s,
             "cross_zone_load_balancing" => load_balancer_attributes.cross_zone_load_balancing.enabled.to_s,
             "dns_name" => load_balancer.dns_name,
-            "health_check.#" => "1",
             "id" => load_balancer.load_balancer_name,
             "idle_timeout" => load_balancer_attributes.connection_settings.idle_timeout.to_s,
             "instances.#" => load_balancer.instances.length.to_s,
-            "listener.#" => load_balancer.listener_descriptions.length.to_s,
             "name" => load_balancer.load_balancer_name,
-            "security_groups.#" => load_balancer.security_groups.length.to_s,
             "source_security_group" => load_balancer.source_security_group.group_name,
-            "subnets.#" => load_balancer.subnets.length.to_s,
           }
+
+          attributes.merge!(healthcheck_attributes_of(load_balancer))
+          attributes.merge!(listeners_attributes_of(load_balancer))
+          attributes.merge!(sg_attributes_of(load_balancer))
+          attributes.merge!(subnets_attributes_of(load_balancer))
+          attributes.merge!(instances_attributes_of(load_balancer))
+          attributes.merge!(tags_attributes_of(load_balancer))
+
+
           result["aws_elb.#{module_name_of(load_balancer)}"] = {
             "type" => "aws_elb",
             "primary" => {
@@ -52,6 +57,108 @@ module Terraforming
         generate_tfstate(resources, tfstate_base)
       end
 
+      def healthcheck_attributes_of(elb)
+        hashcode = healthcheck_hashcode_of(elb.health_check)
+        attributes = {
+          # Now each ELB supports one heatlhcheck
+          "health_check.#" => "1",
+          "health_check.#{hashcode}.healthy_threshold" => elb.health_check.healthy_threshold.to_s,
+          "health_check.#{hashcode}.interval" => elb.health_check.interval.to_s,
+          "health_check.#{hashcode}.target" => elb.health_check.target,
+          "health_check.#{hashcode}.timeout" => elb.health_check.timeout.to_s,
+          "health_check.#{hashcode}.unhealthy_threshold" => elb.health_check.unhealthy_threshold.to_s
+        }
+
+        attributes
+      end
+
+      def healthcheck_hashcode_of(health_check)
+        string =
+          "#{health_check.healthy_threshold}-" <<
+          "#{health_check.unhealthy_threshold}-" <<
+          "#{health_check.target}-" <<
+          "#{health_check.interval}-" <<
+          "#{health_check.timeout}-"
+
+        Zlib.crc32(string)
+      end
+
+      def tags_attributes_of(elb)
+        tags = @client.describe_tags(load_balancer_names: [elb.load_balancer_name]).tag_descriptions.first.tags
+        attributes = {"tags.#" => tags.length.to_s}
+
+        tags.each do |tag|
+          attributes["tags.#{tag.key}"] = tag.value
+        end
+
+        attributes
+      end
+
+      def instances_attributes_of(elb)
+        attributes = {"instances.#" => elb.instances.length.to_s}
+
+        elb.instances.each do |instance|
+          attributes["instances.#{Zlib.crc32(instance.instance_id)}"] = instance.instance_id
+        end
+
+        attributes
+      end
+
+      def subnets_attributes_of(elb)
+        attributes = {"subnets.#" => elb.subnets.length.to_s}
+
+        elb.subnets.each do |subnet_id|
+          attributes["subnets.#{Zlib.crc32(subnet_id)}"] = subnet_id
+        end
+
+        attributes
+      end
+
+      def sg_attributes_of(elb)
+        attributes = {"security_groups.#" => elb.security_groups.length.to_s}
+
+        elb.security_groups.each do |sg_id|
+          attributes["security_groups.#{Zlib.crc32(sg_id)}"] = sg_id
+        end
+
+        attributes
+      end
+
+      def listeners_attributes_of(elb)
+        attributes = {"listener.#" => elb.listener_descriptions.length.to_s}
+
+        elb.listener_descriptions.each do |listener_description|
+          attributes.merge!(listener_attributes_of(listener_description.listener))
+        end
+
+        attributes
+      end
+
+      def listener_attributes_of(listener)
+        hashcode = listener_hashcode_of(listener)
+
+        attributes = {
+          "listener.#{hashcode}.instance_port" => listener.instance_port.to_s,
+          "listener.#{hashcode}.instance_protocol" => listener.instance_protocol.downcase,
+          "listener.#{hashcode}.lb_port" => listener.load_balancer_port.to_s,
+          "listener.#{hashcode}.lb_protocol" => listener.protocol.downcase,
+          "listener.#{hashcode}.ssl_certificate_id" => listener.ssl_certificate_id
+        }
+
+        attributes
+      end
+
+      def listener_hashcode_of(listener)
+        string =
+          "#{listener.instance_port}-" <<
+          "#{listener.instance_protocol.downcase}-" <<
+          "#{listener.load_balancer_port}-" <<
+          "#{listener.protocol.downcase}-" <<
+          "#{listener.ssl_certificate_id}-"
+
+        Zlib.crc32(string)
+      end
+
       def load_balancers
         @client.describe_load_balancers.load_balancer_descriptions
       end

data/lib/terraforming/resource/route53_record.rb

@@ -77,7 +77,7 @@ module Terraforming
       end
 
       def module_name_of(record)
-        normalize_module_name(name_of(record.name))
+        normalize_module_name(name_of(record.name) + "-" + record.type)
       end
 
       def zone_id_of(hosted_zone)

data/lib/terraforming/template/tf/ec2.erb

@@ -5,16 +5,35 @@ resource "aws_instance" "<%= module_name_of(instance) %>" {
     ebs_optimized               = <%= instance.ebs_optimized %>
     instance_type               = "<%= instance.instance_type %>"
     key_name                    = "<%= instance.key_name %>"
-    security_groups             = <%= instance.security_groups.map { |sg| sg.group_id }.inspect %>
+<%- if in_vpc?(instance) -%>
     subnet_id                   = "<%= instance.subnet_id %>"
+    vpc_security_group_ids      = <%= instance.security_groups.map { |sg| sg.group_id }.inspect %>
+<%- else -%>
+    security_groups             = <%= instance.security_groups.map { |sg| sg.group_name }.inspect %>
+<%- end -%>
     associate_public_ip_address = true
     private_ip                  = "<%= instance.private_ip_address %>"
     source_dest_check           = <%= instance.source_dest_check %>
 
-<% instance.block_device_mappings.each do |block_device| -%>
+<% block_devices_of(instance).each do |block_device| -%>
+<%- mapping = block_device_mapping_of(instance, block_device.volume_id) -%>
+<%- if root_block_device?(mapping, instance) -%>
+    root_block_device {
+        volume_type           = "<%= block_device.volume_type %>"
+        volume_size           = <%= block_device.size %>
+        iops                  = <%= block_device.iops %>
+        delete_on_termination = <%= mapping.ebs.delete_on_termination %>
+    }
+<%- else -%>
     ebs_block_device {
-        device_name = "<%= block_device.device_name %>"
+        device_name           = "<%= mapping.device_name %>"
+        snapshot_id           = "<%= block_device.snapshot_id %>"
+        volume_type           = "<%= block_device.volume_type %>"
+        volume_size           = <%= block_device.size %>
+        iops                  = <%= block_device.iops %>
+        delete_on_termination = <%= mapping.ebs.delete_on_termination %>
     }
+<% end -%>
 
 <% end -%>
     tags {

data/lib/terraforming/template/tf/elb.erb

@@ -31,6 +31,12 @@ resource "aws_elb" "<%= module_name_of(load_balancer) %>" {
         target              = "<%= load_balancer.health_check.target %>"
         timeout             = <%= load_balancer.health_check.timeout %>
     }
+
+    tags {
+<% @client.describe_tags(load_balancer_names: [load_balancer.load_balancer_name]).tag_descriptions.first.tags.each do |tag| -%>
+        <%= tag.key %> = "<%= tag.value %>"
+<% end -%>
+    }
 }
 
 <% end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -258,9 +258,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)
 test_files: []
-has_rdoc: