terraforming 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3494765760a8cd349634b11dc5309a55240ccb3
-  data.tar.gz: 1757ab71805c7d769cf29e41af0415f718efee6c
+  metadata.gz: 67886dcb207d5bb56ceaf16ca3051f771f65ffad
+  data.tar.gz: 35ba0a5d88adec6d84fc14af5966c505ab81ac00
 SHA512:
-  metadata.gz: 0ba68b54b90145eaa4d47fda7e251b479794272a0023cd0224d25bbfd6e13128c6181f832b2868c9e8986dc902dcf229893d254e079fa01fe4d2248e570f41ac
-  data.tar.gz: b28b0e95becc9ee47c70757fe936e20829dabd58eb09722d9d4793e6288c3a68d8fba28ee082a27690b1eb1557a0a454cd79ea658f15ede3d3e1dcb4e27b437e
+  metadata.gz: 6fe49e3e0d6e45c8f13fb0750b4021cddc09ebe73c7c6ac4db95914a72cfb9c55be583c875586a837b030c6190ad313e73529bedd09f5828ce23c72080ae9b16
+  data.tar.gz: 5b120fdc4fe6039ad4883408b994d69042cde5c62f30fd5cb2ffb259a213d1d257341b3374cc257c6db7bd928f6169ea356b32368a7332e6e1ef6b38a276e346

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [v0.6.2](https://github.com/dtan4/terraforming/releases/tag/v0.6.2) (2015-12-11)
+
+## Fixed
+
+- Get zone comment of Route53 Zone #149 (thanks @tjend)
+- Skip implicit Route Table Association when generating tfstate #148 (thanks @kovyrin)
+- Improve Route Table support #146 (thanks @kovyrin)
+- Ignore EC2 source_dest_check if nil #143 (thanks @cmcarthur)
+
 # [v0.6.1](https://github.com/dtan4/terraforming/releases/tag/v0.6.1) (2015-11-27)
 
 ## Fixed

data/README.md

@@ -7,6 +7,7 @@
 [![Gem Version](https://badge.fury.io/rb/terraforming.svg)](http://badge.fury.io/rb/terraforming)
 [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
 [![Docker Repository on Quay.io](https://quay.io/repository/dtan4/terraforming/status "Docker Repository on Quay.io")](https://quay.io/repository/dtan4/terraforming)
+[![Join the chat at https://gitter.im/dtan4/terraforming](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dtan4/terraforming?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Export existing AWS resources to [Terraform](https://terraform.io/) style (tf, tfstate)
 

data/lib/terraforming/resource/route53_zone.rb

@@ -25,6 +25,7 @@ module Terraforming
           vpc = vpc_of(hosted_zone)
 
           attributes = {
+            "comment"=> comment_of(hosted_zone),
             "id"=> zone_id,
             "name"=> name_of(hosted_zone),
             "name_servers.#" => name_servers_of(hosted_zone).length.to_s,
@@ -55,6 +56,10 @@ module Terraforming
         @client.list_tags_for_resource(resource_type: "hostedzone", resource_id: zone_id_of(hosted_zone)).resource_tag_set.tags
       end
 
+      def comment_of(hosted_zone)
+        hosted_zone.hosted_zone.config.comment
+      end
+
       def name_of(hosted_zone)
         hosted_zone.hosted_zone.name.gsub(/\.\z/, "")
       end

data/lib/terraforming/resource/route_table.rb

@@ -23,10 +23,13 @@ module Terraforming
         route_tables.inject({}) do |resources, route_table|
           attributes = {
             "id" => route_table.route_table_id,
-            "route.#" => routes_of(route_table).length.to_s,
-            "tags.#" => route_table.tags.length.to_s,
             "vpc_id" => route_table.vpc_id,
           }
+
+          attributes.merge!(tags_attributes_of(route_table))
+          attributes.merge!(routes_attributes_of(route_table))
+          attributes.merge!(propagating_vgws_attributes_of(route_table))
+
           resources["aws_route_table.#{module_name_of(route_table)}"] = {
             "type" => "aws_route_table",
             "primary" => {
@@ -42,7 +45,11 @@ module Terraforming
       private
 
       def routes_of(route_table)
-        route_table.routes
+        route_table.routes.reject do |route|
+          route.gateway_id.to_s == 'local' ||
+          route.origin.to_s == 'EnableVgwRoutePropagation' ||
+          route.destination_prefix_list_id
+        end
       end
 
       def module_name_of(route_table)
@@ -52,6 +59,72 @@ module Terraforming
       def route_tables
         @client.describe_route_tables.route_tables
       end
+
+      def routes_attributes_of(route_table)
+        routes = routes_of(route_table)
+        attributes = { "route.#" => routes.length.to_s }
+
+        routes.each do |route|
+          attributes.merge!(route_attributes_of(route))
+        end
+
+        attributes
+      end
+
+      def route_attributes_of(route)
+        hashcode = route_hashcode_of(route)
+        attributes = {
+          "route.#{hashcode}.cidr_block" => route.destination_cidr_block.to_s,
+          "route.#{hashcode}.gateway_id" => route.gateway_id.to_s,
+          "route.#{hashcode}.instance_id" => route.instance_id.to_s,
+          "route.#{hashcode}.network_interface_id" => route.network_interface_id.to_s,
+          "route.#{hashcode}.vpc_peering_connection_id" => route.vpc_peering_connection_id.to_s
+        }
+
+        attributes
+      end
+
+      def route_hashcode_of(route)
+        string = "#{route.destination_cidr_block}-" <<
+                 "#{route.gateway_id}-"
+
+        instance_set = false
+        if route.instance_id != ''
+          string << route.instance_id.to_s
+          instance_set = true
+        end
+
+        string << route.vpc_peering_connection_id.to_s
+
+        unless instance_set
+          string << route.network_interface_id.to_s
+        end
+
+        Zlib.crc32(string)
+      end
+
+      def propagaving_vgws_of(route_table)
+        route_table.propagating_vgws.map(&:gateway_id).map(&:to_s)
+      end
+
+      def propagating_vgws_attributes_of(route_table)
+        vgws = propagaving_vgws_of(route_table)
+        attributes = { "propagating_vgws.#" => vgws.length.to_s }
+
+        vgws.each do |gateway_id|
+          hashcode = Zlib.crc32(gateway_id)
+          attributes["propagating_vgws.#{hashcode}"] = gateway_id
+        end
+
+        attributes
+      end
+
+      def tags_attributes_of(route_table)
+        tags = route_table.tags
+        attributes = { "tags.#" => tags.length.to_s }
+        tags.each { |tag| attributes["tags.#{tag.key}"] = tag.value }
+        attributes
+      end
     end
   end
 end

data/lib/terraforming/resource/route_table_association.rb

@@ -28,6 +28,7 @@ module Terraforming
               "route_table_id" => assoc.route_table_id,
               "subnet_id" => assoc.subnet_id,
             }
+
             resources["aws_route_table_association.#{module_name_of(route_table, assoc)}"] = {
               "type" => "aws_route_table_association",
               "primary" => {
@@ -43,7 +44,7 @@ module Terraforming
       private
 
       def associations_of(route_table)
-        route_table.associations
+        route_table.associations.reject { |association| association.subnet_id.nil? }
       end
 
       def module_name_of(route_table, assoc)

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

@@ -14,7 +14,9 @@ resource "aws_instance" "<%= module_name_of(instance) %>" {
 <%- end -%>
     associate_public_ip_address = true
     private_ip                  = "<%= instance.private_ip_address %>"
+<%- if instance.source_dest_check -%>
     source_dest_check           = <%= instance.source_dest_check %>
+<%- end -%>
 
 <% block_devices_of(instance).each do |block_device| -%>
 <%- mapping = block_device_mapping_of(instance, block_device.volume_id) -%>

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

@@ -1,6 +1,7 @@
 <% hosted_zones.each do |hosted_zone| -%>
 resource "aws_route53_zone" "<%= module_name_of(hosted_zone) %>" {
     name       = "<%= name_of(hosted_zone) %>"
+    comment    = "<%= comment_of(hosted_zone) %>"
 <%- if private_hosted_zone?(hosted_zone) -%>
   <%- vpc = vpc_of(hosted_zone) -%>
     vpc_id     = "<%= vpc.vpc_id %>"

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

@@ -19,6 +19,10 @@ resource "aws_route_table" "<%= module_name_of(route_table) %>" {
 <% end -%>
     }
 
+<% end -%>
+<% if route_table.propagating_vgws.any? -%>
+    propagating_vgws = <%= propagaving_vgws_of(route_table).inspect %>
+
 <% end -%>
     tags {
 <% route_table.tags.each do |tag| -%>

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

@@ -1,6 +1,5 @@
 <% route_tables.each do |route_table| -%>
 <% associations_of(route_table).each do |assoc| -%>
-<% if assoc.subnet_id -%>
 resource "aws_route_table_association" "<%= module_name_of(route_table, assoc) %>" {
     route_table_id = "<%= assoc.route_table_id %>"
     subnet_id = "<%= assoc.subnet_id %>"
@@ -8,4 +7,3 @@ resource "aws_route_table_association" "<%= module_name_of(route_table, assoc) %
 
 <% end -%>
 <% end -%>
-<% end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/terraforming.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "aws-sdk", "~> 2.2.0"
+  spec.add_dependency "aws-sdk", "= 2.2.5"
   spec.add_dependency "oj"
   spec.add_dependency "ox"
   spec.add_dependency "thor"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement