terraforming 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81391c43ae75be098888ffb552b0862b5eb84ff3
-  data.tar.gz: 2b3697639b6a79b2ad1bd9f3ad2e668cda9d36be
+  metadata.gz: 244d11650e141679a1bc58831f9e1d54b5f15cba
+  data.tar.gz: 7fe2d54b847abc14c4069ae8186bb3378cbe635e
 SHA512:
-  metadata.gz: daf32d71dc7f775cef0faa84393dc92b7928273a07fe105fb8caa9fe2cda864d061f7fbd6189fab963194d2816dd49f0e19ac82903c4bf07f74e19727194a600
-  data.tar.gz: b025806af68fff47061a5160a3018a271ef5d9ef6e0d55630d9d3f7fb218de2c3d4df146507956d256fef8d337007d8899edaa233aa8350dcd9289a08a0ffb7b
+  metadata.gz: 111cd0aa7c13dd04f64afcf8562756a88bdbaaf6df8698bbbb390b65504f3d7196feeeab90692a41254599f62bbff86db16e2c68aeff3200afa3858b32936ec6
+  data.tar.gz: 9d4870b66f7e9fa38c7f05179be35db7cb0fec3a3e08533519e0128d1e9cff8e637890b15a33ff4c7d018eb5a65147c5e3b18bb60f679bc03bc7449ebc986884

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-- 2.3.0
-- 2.2.4
-- 2.1.8
-- 2.0
+- 2.3.1
+- 2.2.5
+- 2.1.10
 env:
 - secure: n0mxwnyjuXI4mJO4mp++2TnsPJ+XgCF/J1U2L5piE5j3xMhSU+5V0JrA1uFlS0Pemb44M7BjgmF9S4G35BwyAQpctpCYhqy9tFa6+Y6nxEv5hCv2cZz7BSAZM6eb+zq20409hxTHRaQOr1DBeE4R5S2PrmOXRqvYfTRv3LNSLFk=
 notifications:

data/CHANGELOG.md

@@ -1,4 +1,33 @@
-# [v0.7.0](https://github.com/dtan4/terraforming/releases/tag/v0.6.2) (2016-02-16)
+# [v0.8.0](https://github.com/dtan4/terraforming/releases/tag/v0.8.0) (2016-05-29)
+
+## Notice
+
+- Drop Ruby 2.0 support. Now Terraforming supports Ruby 2.1 or higher. #206
+
+## Resource
+
+- AWS VPN Gateway #190 (thanks @tmccabe07)
+- AWS Launch Configuration #187 (thanks @phoolish)
+- AWS SQS #169 (thanks @manabusakai)
+
+## Fixed / Updated
+
+- Add prefix not to duplicate IAM inline policy name #212 (thanks @stormbeta)
+- Use the latest Ox and Oj #210
+- Simplify Security Group name #207 (thanks @woohgit)
+- Include description field for IAM policies #203 (thanks @stormbeta)
+- Support paging paging for IAM resources #201 (thanks @dominis)
+- Fix Security Group output around EC2-Classic #200 (thanks @woohgit)
+- Default Route53 record weight should be "-1" #197 (thanks @woohgit)
+- Add Elasticache Redis port #189 (thanks @phoolish)
+- Add `--region` option #188 (thanks @hajhatten)
+- Add zsh completion #176 (thanks @knakayama)
+- Add subnet ID to the resource name #185 (thanks @bandesz)
+- Add EC2 placement group #180 (thanks @wsh)
+- Wrap tag name in ELB #179 (thanks @robatwave)
+- Retrive full list of AutoScaling Groups #170 (thanks @shouyu)
+
+# [v0.7.0](https://github.com/dtan4/terraforming/releases/tag/v0.7.0) (2016-02-16)
 
 ## Resource
 

data/Gemfile

@@ -2,3 +2,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in terraforming.gemspec
 gemspec
+
+group :development do
+  gem "guard"
+  gem "guard-rspec"
+
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.0")
+    gem "listen", "~> 3.1.0"
+  else
+    gem "listen", "< 3.1.0"
+  end
+
+  gem "terminal-notifier-guard"
+end

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/dtan4/terraforming.svg?branch=master)](https://travis-ci.org/dtan4/terraforming)
 [![Code Climate](https://codeclimate.com/github/dtan4/terraforming/badges/gpa.svg)](https://codeclimate.com/github/dtan4/terraforming)
-[![Test Coverage](https://codeclimate.com/github/dtan4/terraforming/badges/coverage.svg)](https://codeclimate.com/github/dtan4/terraforming)
+[![Coverage Status](https://coveralls.io/repos/github/dtan4/terraforming/badge.svg?branch=increase-test-cov-160528)](https://coveralls.io/github/dtan4/terraforming)
 [![Dependency Status](https://gemnasium.com/dtan4/terraforming.svg)](https://gemnasium.com/dtan4/terraforming)
 [![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)
@@ -17,6 +17,7 @@ Export existing AWS resources to [Terraform](https://terraform.io/) style (tf, t
 - [Usage](#usage)
   -  [Export tf](#export-tf)
   -  [Export tfstate](#export-tfstate)
+    -  [Example: Export all](#example-export-all)
 - [Run as Docker container](#run-as-docker-container-)
 - [Development](#development)
 - [Contributing](#contributing)
@@ -24,7 +25,7 @@ Export existing AWS resources to [Terraform](https://terraform.io/) style (tf, t
 
 ## Supported version
 
-Ruby 2.x
+Ruby 2.1 or higher
 
 ## Installation
 
@@ -88,6 +89,7 @@ Commands:
   terraforming iamu            # IAM User
   terraforming iamup           # IAM User Policy
   terraforming igw             # Internet Gateway
+  terraforming lc              # Launch Configuration
   terraforming nacl            # Network ACL
   terraforming nif             # Network Interface
   terraforming r53r            # Route53 Record
@@ -99,6 +101,8 @@ Commands:
   terraforming s3              # S3
   terraforming sg              # Security Group
   terraforming sn              # Subnet
+  terraforming sqs             # SQS
+  terraforming vgw             # VPN Gateway
   terraforming vpc             # VPC
 ```
 
@@ -312,6 +316,15 @@ the real physical resources that exist. As a result, Terraform
 doesn't need to do anything.
 ```
 
+#### Example: Export all
+Example assuming you want to export everything from us-west-2 and you are using ~/.aws/credentials with a `default` profile
+```bash
+export AWS_REGION=us-west-2
+terraforming help | grep terraforming | grep -v help | awk '{print "terraforming", $2, "--profile", "default", ">", $2".tf";}' | bash
+# remove files that only have 1 empty line (nothing in AWS)
+find . -type f | xargs wc -l | grep '1 .' | awk '{print $2;}' | xargs rm
+```
+
 ## Run as Docker container [![Docker Repository on Quay.io](https://quay.io/repository/dtan4/terraforming/status "Docker Repository on Quay.io")](https://quay.io/repository/dtan4/terraforming)
 
 Terraforming Docker Image is available at [quay.io/dtan4/terraforming](https://quay.io/repository/dtan4/terraforming) and developed at [dtan4/dockerfile-terraforming](https://github.com/dtan4/dockerfile-terraforming).

data/contrib/zsh-completion/_terraforming

@@ -0,0 +1,65 @@
+#compdef terraforming
+
+function _terraforming() {
+  local context curcontext=$curcontext state line
+  typeset -A opt_args
+  local ret=1
+
+  _arguments -C \
+    '1: :__terraforming_sub_commands' \
+    '*:: :->args' \
+    && ret=0
+
+  case $state in
+    (args)
+      case $words[1] in
+        (help)
+          _arguments -C \
+            '1: :__terraforming_sub_commands' \
+            '(-)*:: :->null_state' \
+            && ret=0
+        ;;
+      (*)
+          _arguments -C \
+            '--merge=[(TFSTATE) tfstate file to merge]:tfstate file to merge:_files' \
+            '--overwrite[Overwrite existing tfstate]' \
+            '--no-overwrite[Do not overwrite existing tfstate]' \
+            '--tfstate[Generate tfstate]' \
+            '--no-tfstate[Do not generate tfstate]' \
+            '--profile[(PROFILE) AWS credentials profile]:AWS credentials profile:__profiles' \
+            && ret=0
+        ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+__terraforming_sub_commands() {
+  local -a _c
+
+  _c=(
+    "${(@f)$(terraforming --help \
+      | grep '  terraforming' \
+      | sed -E 's/^  terraforming //g' \
+      | sed -E 's/ *(\[COMMAND\])? *# /:/g')}"
+    )
+
+  _describe -t commands terraforming_sub_commands _c
+}
+
+__profiles() {
+  local _profile_path="${HOME}/.aws/credentials"
+  local -a _profiles
+
+  _profiles=(
+    ${(@f)"$(_call_program profiles \
+      "grep -E '^\[.*\]$' "$_profile_path" \
+        | sed -e 's/\[//' -e 's/\]//'")"}
+    )
+
+  _describe -t profiles Profiles _profiles
+}
+
+_terraforming "$@"

data/lib/terraforming.rb

@@ -29,6 +29,7 @@ require "terraforming/resource/iam_role"
 require "terraforming/resource/iam_role_policy"
 require "terraforming/resource/iam_user"
 require "terraforming/resource/iam_user_policy"
+require "terraforming/resource/launch_configuration"
 require "terraforming/resource/internet_gateway"
 require "terraforming/resource/network_acl"
 require "terraforming/resource/network_interface"
@@ -41,4 +42,6 @@ require "terraforming/resource/route53_zone"
 require "terraforming/resource/s3"
 require "terraforming/resource/security_group"
 require "terraforming/resource/subnet"
+require "terraforming/resource/sqs"
 require "terraforming/resource/vpc"
+require "terraforming/resource/vpn_gateway"

data/lib/terraforming/cli.rb

@@ -4,6 +4,7 @@ module Terraforming
     class_option :overwrite, type: :boolean, desc: "Overwrite existng tfstate"
     class_option :tfstate, type: :boolean, desc: "Generate tfstate"
     class_option :profile, type: :string, desc: "AWS credentials profile"
+    class_option :region, type: :string, desc: "AWS region"
 
     desc "asg", "AutoScaling Group"
     def asg
@@ -95,6 +96,11 @@ module Terraforming
       execute(Terraforming::Resource::IAMUserPolicy, options)
     end
 
+    desc "lc", "Launch Configuration"
+    def lc
+      execute(Terraforming::Resource::LaunchConfiguration, options)
+    end
+
     desc "igw", "Internet Gateway"
     def igw
       execute(Terraforming::Resource::InternetGateway, options)
@@ -155,15 +161,27 @@ module Terraforming
       execute(Terraforming::Resource::Subnet, options)
     end
 
+    desc "sqs", "SQS"
+    def sqs
+      execute(Terraforming::Resource::SQS, options)
+    end
+
     desc "vpc", "VPC"
     def vpc
       execute(Terraforming::Resource::VPC, options)
     end
 
+    desc "vgw", "VPN Gateway"
+    def vgw
+      execute(Terraforming::Resource::VPNGateway, options)
+    end
+
+
     private
 
     def execute(klass, options)
       Aws.config[:credentials] = Aws::SharedCredentials.new(profile_name: options[:profile]) if options[:profile]
+      Aws.config[:region] = options[:region] if options[:region]
       result = options[:tfstate] ? tfstate(klass, options[:merge]) : tf(klass)
 
       if options[:tfstate] && options[:merge] && options[:overwrite]

data/lib/terraforming/resource/auto_scaling_group.rb

@@ -67,7 +67,7 @@ module Terraforming
       private
 
       def auto_scaling_groups
-        @client.describe_auto_scaling_groups.auto_scaling_groups
+        @client.describe_auto_scaling_groups.map(&:auto_scaling_groups).flatten
       end
 
       def module_name_of(group)

data/lib/terraforming/resource/ec2.rb

@@ -45,6 +45,9 @@ module Terraforming
             "vpc_security_group_ids.#"=> in_vpc ? instance.security_groups.length.to_s : "0",
           }
 
+          placement_group = instance.placement.group_name
+          attributes["placement_group"] = placement_group unless placement_group.empty?
+
           attributes["subnet_id"] = instance.subnet_id if in_vpc?(instance)
 
           resources["aws_instance.#{module_name_of(instance)}"] = {

data/lib/terraforming/resource/elasti_cache_cluster.rb

@@ -36,8 +36,11 @@ module Terraforming
             "tags.#" => "0",
           }
 
-          attributes["port"] =
-            cache_cluster.configuration_endpoint.port.to_s if cache_cluster.configuration_endpoint
+          attributes["port"] = if cache_cluster.configuration_endpoint
+            cache_cluster.configuration_endpoint.port.to_s
+          else
+            cache_cluster.cache_nodes[0].endpoint.port.to_s
+          end
 
           resources["aws_elasticache_cluster.#{cache_cluster.cache_cluster_id}"] = {
             "type" => "aws_elasticache_cluster",

data/lib/terraforming/resource/iam_group.rb

@@ -43,7 +43,7 @@ module Terraforming
       private
 
       def iam_groups
-        @client.list_groups.groups
+        @client.list_groups.collect {|r| r.groups}.flatten
       end
     end
   end

data/lib/terraforming/resource/iam_group_policy.rb

@@ -27,7 +27,7 @@ module Terraforming
             "name" => policy.policy_name,
             "policy" => prettify_policy(policy.policy_document, breakline: true, unescape: true)
           }
-          resources["aws_iam_group_policy.#{policy.policy_name}"] = {
+          resources["aws_iam_group_policy.#{unique_name(policy)}"] = {
             "type" => "aws_iam_group_policy",
             "primary" => {
               "id" => iam_group_policy_id_of(policy),
@@ -41,6 +41,10 @@ module Terraforming
 
       private
 
+      def unique_name(policy)
+        "#{policy.group_name}_#{policy.policy_name}"
+      end
+
       def iam_groups
         @client.list_groups.groups
       end

data/lib/terraforming/resource/iam_policy.rb

@@ -26,6 +26,7 @@ module Terraforming
             "id" => policy.arn,
             "name" => policy.policy_name,
             "path" => policy.path,
+            "description" => iam_policy_description(policy),
             "policy" => prettify_policy(version.document, breakline: true, unescape: true),
           }
           resources["aws_iam_policy.#{policy.policy_name}"] = {
@@ -43,7 +44,11 @@ module Terraforming
       private
 
       def iam_policies
-        @client.list_policies(scope: "Local").policies
+        @client.list_policies(scope: "Local").collect {|r| r.policies}.flatten
+      end
+
+      def iam_policy_description(policy)
+        @client.get_policy(policy_arn: policy.arn).policy.description
       end
 
       def iam_policy_version_of(policy)

data/lib/terraforming/resource/iam_role.rb

@@ -45,7 +45,7 @@ module Terraforming
       private
 
       def iam_roles
-        @client.list_roles.roles
+        @client.list_roles.collect {|r| r.roles}.flatten
       end
     end
   end

data/lib/terraforming/resource/iam_role_policy.rb

@@ -27,7 +27,7 @@ module Terraforming
             "policy" => prettify_policy(policy.policy_document, breakline: true, unescape: true),
             "role" => policy.role_name,
           }
-          resources["aws_iam_role_policy.#{policy.policy_name}"] = {
+          resources["aws_iam_role_policy.#{unique_name(policy)}"] = {
             "type" => "aws_iam_role_policy",
             "primary" => {
               "id" => iam_role_policy_id_of(policy),
@@ -41,6 +41,10 @@ module Terraforming
 
       private
 
+      def unique_name(policy)
+        "#{policy.role_name}_#{policy.policy_name}"
+      end
+
       def iam_roles
         @client.list_roles.roles
       end

data/lib/terraforming/resource/iam_user_policy.rb

@@ -27,7 +27,7 @@ module Terraforming
             "policy" => prettify_policy(policy.policy_document, breakline: true, unescape: true),
             "user" => policy.user_name,
           }
-          resources["aws_iam_user_policy.#{policy.policy_name}"] = {
+          resources["aws_iam_user_policy.#{unique_name(policy)}"] = {
             "type" => "aws_iam_user_policy",
             "primary" => {
               "id" => iam_user_policy_id_of(policy),
@@ -41,6 +41,10 @@ module Terraforming
 
       private
 
+      def unique_name(policy)
+        "#{policy.user_name}_#{policy.policy_name}"
+      end
+
       def iam_users
         @client.list_users.users
       end

data/lib/terraforming/resource/launch_configuration.rb

@@ -0,0 +1,109 @@
+module Terraforming
+  module Resource
+    class LaunchConfiguration
+      include Terraforming::Util
+
+      def self.tf(client: Aws::AutoScaling::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::AutoScaling::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/launch_configuration")
+      end
+
+      def tfstate
+        launch_configurations.inject({}) do |resources, lc|
+
+          attributes = {
+            "name" => lc.launch_configuration_name,
+            "image_id" => lc.image_id,
+            "instance_type" => lc.instance_type,
+            "key_name" => lc.key_name,
+            "security_groups.#" => lc.security_groups.length.to_s,
+            "associate_public_ip_address" => lc.associate_public_ip_address.to_s,
+            "user_data" => lc.user_data,
+            "enable_monitoring" => lc.instance_monitoring.enabled.to_s,
+            "ebs_optimized" => lc.ebs_optimized.to_s,
+            "root_block_device.#" => root_block_device_count(lc).to_s,
+            "ebs_block_device.#" => ebs_block_device_count(lc).to_s,
+            "ephemeral_block_device.#" => ephemeral_block_device_count(lc).to_s
+          }
+
+          lc.security_groups.each do |sg|
+            hash = hash_security_group(sg)
+            attributes["security_groups.#{hash}"] = sg
+          end
+
+          attributes["iam_instance_profile"] = lc.iam_instance_profile if lc.iam_instance_profile
+          attributes["spot_price"] = lc.spot_price if lc.spot_price
+          attributes["placement_tenancy"] = lc.placement_tenancy if lc.placement_tenancy
+
+          resources["aws_launch_configuration.#{module_name_of(lc)}"] = {
+            "type" => "aws_launch_configuration",
+            "primary" => {
+              "id" => lc.launch_configuration_name,
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      # Taken from http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/device_naming.html
+      def root_block_device?(block_device)
+        %w(/dev/sda1 /dev/xvda).include? block_device.device_name
+      end
+
+      def root_block_device_count(launch_configuration)
+        launch_configuration.block_device_mappings.select do |volume|
+          root_block_device?(volume)
+        end.length
+      end
+
+      def ebs_block_device?(block_device)
+        block_device.virtual_name == nil && block_device.ebs
+      end
+
+      def ebs_block_device_count(launch_configuration)
+        launch_configuration.block_device_mappings.select do |volume|
+          ebs_block_device?(volume) && !root_block_device?(volume)
+        end.length
+      end
+
+      def ephemeral_block_device?(block_device)
+        block_device.virtual_name != nil
+      end
+
+      def ephemeral_block_device_count(launch_configuration)
+        launch_configuration.block_device_mappings.select do |volume|
+          ephemeral_block_device?(volume)
+        end.length
+      end
+
+      def hash_security_group(name)
+        Zlib.crc32(name)
+      end
+
+      def launch_configurations
+        @client.describe_launch_configurations.collect do |r|
+          r.launch_configurations
+        end.flatten
+      end
+
+      def module_name_of(launch_configuration)
+        normalize_module_name(launch_configuration.launch_configuration_name)
+      end
+    end
+  end
+end

data/lib/terraforming/resource/route53_record.rb

@@ -34,7 +34,7 @@ module Terraforming
           attributes["alias.#"] = "1" if record.alias_target
           attributes["records.#"] = record.resource_records.length.to_s unless record.resource_records.empty?
           attributes["ttl"] = record.ttl.to_s if record.ttl
-          attributes["weight"] = record.weight.to_s if record.weight
+          attributes["weight"] = record.weight ? record.weight.to_s : "-1"
           attributes["set_identifier"] = record.set_identifier if record.set_identifier
 
           resources["aws_route53_record.#{module_name_of(record)}"] = {

data/lib/terraforming/resource/route_table.rb

@@ -85,20 +85,12 @@ module Terraforming
       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.destination_cidr_block}-#{route.gateway_id}-"
+        instance_set = !route.instance_id.nil? && route.instance_id != ''
 
+        string << route.instance_id.to_s if instance_set
         string << route.vpc_peering_connection_id.to_s
-
-        unless instance_set
-          string << route.network_interface_id.to_s
-        end
+        string << route.network_interface_id.to_s unless instance_set
 
         Zlib.crc32(string)
       end

data/lib/terraforming/resource/security_group.rb

@@ -74,12 +74,17 @@ module Terraforming
       end
 
       def module_name_of(security_group)
-        normalize_module_name("#{security_group.group_id}-#{security_group.group_name}")
+        if security_group.vpc_id.nil?
+          normalize_module_name("#{security_group.group_name}")
+        else
+          normalize_module_name("#{security_group.vpc_id}-#{security_group.group_name}")
+        end
       end
 
       def permission_attributes_of(security_group, permission, type)
         hashcode = permission_hashcode_of(security_group, permission)
-        security_groups = security_groups_in(permission).reject { |group_id| group_id == security_group.group_id }
+        security_groups = security_groups_in(permission, security_group).reject { |group_name| group_name == security_group.group_name }.reject { |group_id| group_id == security_group.group_id }
+
 
         attributes = {
           "#{type}.#{hashcode}.from_port" => (permission.from_port || 0).to_s,
@@ -138,21 +143,32 @@ module Terraforming
           "#{self_referenced_permission?(security_group, permission).to_s}-"
 
         permission.ip_ranges.each { |range| string << "#{range.cidr_ip}-" }
-        security_groups_in(permission).each { |group| string << "#{group}-" }
+        security_groups_in(permission, security_group).each { |group| string << "#{group}-" }
 
         Zlib.crc32(string)
       end
 
       def self_referenced_permission?(security_group, permission)
-        security_groups_in(permission).include?(security_group.group_id)
+        (security_groups_in(permission, security_group) & [security_group.group_id, security_group.group_name]).any?
       end
 
       def security_groups
         @client.describe_security_groups.security_groups
       end
 
-      def security_groups_in(permission)
-        permission.user_id_group_pairs.map { |range| range.group_id }
+      def security_groups_in(permission, security_group)
+        permission.user_id_group_pairs.map { |range|
+          # EC2-Classic, same account
+          if security_group.owner_id == range.user_id && !range.group_name.nil?
+            range.group_name
+          # VPC
+          elsif security_group.owner_id == range.user_id && range.group_name.nil?
+            range.group_id
+          # EC2-Classic, other account
+          else
+            "#{range.user_id}/#{range.group_name}"
+          end
+        }
       end
 
       def tags_attributes_of(security_group)

data/lib/terraforming/resource/sqs.rb

@@ -0,0 +1,70 @@
+module Terraforming
+  module Resource
+    class SQS
+      include Terraforming::Util
+
+      def self.tf(client: Aws::SQS::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::SQS::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/sqs")
+      end
+
+      def tfstate
+        queues.inject({}) do |resources, queue|
+          attributes = {
+            "name"                       => module_name_of(queue),
+            "id"                         => queue["QueueUrl"],
+            "arn"                        => queue["QueueArn"],
+            "visibility_timeout_seconds" => queue["VisibilityTimeout"],
+            "message_retention_seconds"  => queue["MessageRetentionPeriod"],
+            "max_message_size"           => queue["MaximumMessageSize"],
+            "delay_seconds"              => queue["DelaySeconds"],
+            "receive_wait_time_seconds"  => queue["ReceiveMessageWaitTimeSeconds"],
+            "policy"                     => queue.key?("Policy") ? queue["Policy"] : "",
+            "redrive_policy"             => queue.key?("RedrivePolicy") ? queue["RedrivePolicy"] : "",
+          }
+          resources["aws_sqs_queue.#{module_name_of(queue)}"] = {
+            "type" => "aws_sqs_queue",
+            "primary" => {
+              "id"         => queue["QueueUrl"],
+              "attributes" => attributes,
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def queues
+        queue_urls.map do |queue_url|
+          attributes = @client.get_queue_attributes({
+            queue_url: queue_url,
+            attribute_names: ["All"],
+          }).attributes
+          attributes["QueueUrl"] = queue_url
+          attributes
+        end
+      end
+
+      def queue_urls
+        @client.list_queues.queue_urls
+      end
+
+      def module_name_of(queue)
+        normalize_module_name(queue["QueueArn"].split(":").last)
+      end
+    end
+  end
+end

data/lib/terraforming/resource/subnet.rb

@@ -48,7 +48,7 @@ module Terraforming
       end
 
       def module_name_of(subnet)
-        normalize_module_name(name_from_tag(subnet, subnet.subnet_id))
+        normalize_module_name("#{subnet.subnet_id}-#{name_from_tag(subnet, subnet.subnet_id)}")
       end
     end
   end

data/lib/terraforming/resource/vpn_gateway.rb

@@ -0,0 +1,55 @@
+module Terraforming
+  module Resource
+    class VPNGateway
+      include Terraforming::Util
+
+      def self.tf(client: Aws::EC2::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::EC2::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/vpn_gateway")
+      end
+
+      def tfstate
+        vpn_gateways.inject({}) do |resources, vpn_gateway|
+          next resources if vpn_gateway.vpc_attachments.empty?
+
+          attributes = {
+            "id"     => vpn_gateway.vpn_gateway_id,
+            "vpc_id" => vpn_gateway.vpc_attachments[0].vpc_id,
+            "availability_zone" => vpn_gateway.availability_zone,
+            "tags.#" => vpn_gateway.tags.length.to_s,
+          }
+          resources["aws_vpn_gateway.#{module_name_of(vpn_gateway)}"] = {
+            "type" => "aws_vpn_gateway",
+            "primary" => {
+              "id"         => vpn_gateway.vpn_gateway_id,
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def vpn_gateways
+        @client.describe_vpn_gateways.vpn_gateways
+      end
+
+      def module_name_of(vpn_gateway)
+        normalize_module_name(name_from_tag(vpn_gateway, vpn_gateway.vpn_gateway_id))
+      end
+    end
+  end
+end

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

@@ -4,6 +4,9 @@ resource "aws_instance" "<%= module_name_of(instance) %>" {
     availability_zone           = "<%= instance.placement.availability_zone %>"
     ebs_optimized               = <%= instance.ebs_optimized %>
     instance_type               = "<%= instance.instance_type %>"
+<%- unless instance.placement.group_name.empty? -%>
+    placement_group             = "<%= instance.placement.group_name %>"
+<%- end -%>
     monitoring                  = <%= monitoring_state(instance) %>
     key_name                    = "<%= instance.key_name %>"
 <%- if in_vpc?(instance) -%>

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

@@ -8,6 +8,8 @@ resource "aws_elasticache_cluster" "<%= cache_cluster.cache_cluster_id %>" {
     parameter_group_name = "<%= cache_cluster.cache_parameter_group.cache_parameter_group_name %>"
   <%- if cache_cluster.configuration_endpoint -%>
     port                 = <%= cache_cluster.configuration_endpoint.port %>
+  <%- else -%>
+    port                 = <%= cache_cluster.cache_nodes[0].endpoint.port %>
   <%- end -%>
   <%- if cluster_in_vpc?(cache_cluster) -%>
     subnet_group_name    = "<%= cache_cluster.cache_subnet_group_name %>"

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

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

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

@@ -1,5 +1,5 @@
 <% iam_group_policies.each do |policy| -%>
-resource "aws_iam_group_policy" "<%= policy.policy_name %>" {
+resource "aws_iam_group_policy" "<%= unique_name(policy) %>" {
     name   = "<%= policy.policy_name %>"
     group  = "<%= policy.group_name %>"
     policy = <<POLICY

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

@@ -1,9 +1,10 @@
 <% iam_policies.each do |policy| -%>
   <%- version = iam_policy_version_of(policy) -%>
 resource "aws_iam_policy" "<%= policy.policy_name %>" {
-    name   = "<%= policy.policy_name %>"
-    path   = "<%= policy.path %>"
-    policy = <<POLICY
+    name        = "<%= policy.policy_name %>"
+    path        = "<%= policy.path %>"
+    description = "<%= iam_policy_description(policy) %>"
+    policy      = <<POLICY
 <%= prettify_policy(version.document, unescape: true) %>
 POLICY
 }

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

@@ -1,5 +1,5 @@
 <% iam_role_policies.each do |policy| -%>
-resource "aws_iam_role_policy" "<%= policy.policy_name %>" {
+resource "aws_iam_role_policy" "<%= unique_name(policy) %>" {
     name   = "<%= policy.policy_name %>"
     role   = "<%= policy.role_name %>"
     policy = <<POLICY

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

@@ -1,5 +1,5 @@
 <% iam_user_policies.each do |policy| -%>
-resource "aws_iam_user_policy" "<%= policy.policy_name %>" {
+resource "aws_iam_user_policy" "<%= unique_name(policy) %>" {
     name   = "<%= policy.policy_name %>"
     user   = "<%= policy.user_name %>"
     policy = <<POLICY

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

@@ -0,0 +1,66 @@
+<% launch_configurations.each do |launch_configuration| -%>
+resource "aws_launch_configuration" "<%= module_name_of(launch_configuration) %>" {
+    name                        = "<%= launch_configuration.launch_configuration_name %>"
+    image_id                    = "<%= launch_configuration.image_id %>"
+    instance_type               = "<%= launch_configuration.instance_type %>"
+<%- if launch_configuration.iam_instance_profile -%>
+    iam_instance_profile        = "<%= launch_configuration.iam_instance_profile %>"
+<%- end -%>
+<%- unless launch_configuration.key_name.empty? -%>
+    key_name                    = "<%= launch_configuration.key_name %>"
+<%- end -%>
+    security_groups             = <%= launch_configuration.security_groups.map { |sg| sg }.inspect %>
+    associate_public_ip_address = <%= launch_configuration.associate_public_ip_address %>
+ <%- unless launch_configuration.user_data.empty? -%>
+    user_data                   = "<%= launch_configuration.user_data %>"
+<%- end -%>
+    enable_monitoring           = <%= launch_configuration.instance_monitoring.enabled %>
+    ebs_optimized               = <%= launch_configuration.ebs_optimized %>
+<%- if launch_configuration.spot_price -%>
+    spot_price                  = "<%= launch_configuration.spot_price %>"
+<%- end -%>
+<%- if launch_configuration.placement_tenancy -%>
+    placement_tenancy          = "<%= launch_configuration.placement_tenancy %>"
+<%- end -%>
+
+<% launch_configuration.block_device_mappings.each do |block_device| -%>
+    <%- if root_block_device?(block_device) -%>
+    root_block_device {
+        <%- if ebs_block_device?(block_device) -%>
+        volume_type           = "<%= block_device.ebs.volume_type %>"
+        volume_size           = <%= block_device.ebs.volume_size %>
+        <%- if block_device.ebs.iops -%>
+        iops                  = <%= block_device.ebs.iops %>
+        <%- end -%>
+        delete_on_termination = <%= block_device.ebs.delete_on_termination %>
+        <%- end -%>
+    }
+
+    <%- elsif ebs_block_device?(block_device) -%>
+    ebs_block_device {
+        device_name           = "<%= block_device.device_name %>"
+        <%- if block_device.ebs.snapshot_id -%>
+        snapshot_id           = "<%= block_device.ebs.snapshot_id %>"
+        <%- end -%>
+        volume_type           = "<%= block_device.ebs.volume_type %>"
+        volume_size           = <%= block_device.ebs.volume_size %>
+        <%- if block_device.ebs.iops -%>
+        iops                  = <%= block_device.ebs.iops %>
+        <%- end -%>
+        delete_on_termination = <%= block_device.ebs.delete_on_termination %>
+        <%- if block_device.ebs.encrypted -%>
+        encrypted             = <%= block_device.ebs.encrypted %>
+        <%- end -%>
+    }
+
+    <%- elsif ephemeral_block_device?(block_device) -%>
+    ephemeral_block_device {
+        device_name = "<%= block_device.device_name %>"
+        virtual_name = "<%= block_device.virtual_name %>"
+    }
+
+    <%- end -%>
+<%- end -%>
+}
+
+<%- end -%>

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

@@ -5,7 +5,7 @@ resource "aws_security_group" "<%= module_name_of(security_group) %>" {
     vpc_id      = "<%= security_group.vpc_id || '' %>"
 
 <% dedup_permissions(security_group.ip_permissions, security_group.group_id).each do |permission| -%>
-  <%- security_groups = security_groups_in(permission).reject { |group_id| group_id == security_group.group_id } -%>
+  <%- security_groups = security_groups_in(permission, security_group).reject { |group_name| group_name == security_group.group_name }.reject { |group_id| group_id == security_group.group_id } -%>
     ingress {
         from_port       = <%= permission.from_port || 0 %>
         to_port         = <%= permission.to_port || 0 %>
@@ -15,9 +15,7 @@ resource "aws_security_group" "<%= module_name_of(security_group) %>" {
 <%- end -%>
 <%- if permission.user_id_group_pairs.length > 0 -%>
   <%- self_referenced = self_referenced_permission?(security_group, permission) -%>
-  <%- unless self_referenced -%>
         security_groups = <%= security_groups.inspect %>
-  <%- end -%>
         self            = <%= self_referenced %>
 <%- end -%>
     }
@@ -34,9 +32,7 @@ resource "aws_security_group" "<%= module_name_of(security_group) %>" {
 <%- end -%>
 <%- if permission.user_id_group_pairs.length > 0 -%>
   <%- self_referenced = self_referenced_permission?(security_group, permission) -%>
-  <%- unless self_referenced -%>
-        security_groups = <%= security_groups_in(permission).inspect %>
-  <%- end -%>
+        security_groups = <%= security_groups_in(permission, security_group).reject { |group_id| group_id == security_group.group_id }.inspect %>
         self            = <%= self_referenced %>
 <%- end -%>
     }

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

@@ -0,0 +1,21 @@
+<% queues.each do |queue| -%>
+resource "aws_sqs_queue" "<%= module_name_of(queue) %>" {
+    name                       = "<%= module_name_of(queue) %>"
+    visibility_timeout_seconds = <%= queue["VisibilityTimeout"] %>
+    message_retention_seconds  = <%= queue["MessageRetentionPeriod"] %>
+    max_message_size           = <%= queue["MaximumMessageSize"] %>
+    delay_seconds              = <%= queue["DelaySeconds"] %>
+    receive_wait_time_seconds  = <%= queue["ReceiveMessageWaitTimeSeconds"] %>
+<% if queue.key? "Policy" -%>
+    policy                     = <<POLICY
+<%= prettify_policy(queue["Policy"], unescape: true) %>
+POLICY
+<% end -%>
+<% if queue.key? "RedrivePolicy" -%>
+    redrive_policy             = <<POLICY
+<%= prettify_policy(queue["RedrivePolicy"], unescape: true) %>
+POLICY
+<% end -%>
+}
+
+<% end -%>

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

@@ -0,0 +1,14 @@
+<% vpn_gateways.each do |vpn_gateway| -%>
+<% unless vpn_gateway.vpc_attachments.empty? -%>
+resource "aws_vpn_gateway" "<%= module_name_of(vpn_gateway) %>" {
+    vpc_id = "<%= vpn_gateway.vpc_attachments[0].vpc_id %>"
+    availability_zone = "<%= vpn_gateway.availability_zone %>"
+    tags {
+<% vpn_gateway.tags.each do |tag| -%>
+        "<%= tag.key %>" = "<%= tag.value %>"
+<% end -%>
+    }
+}
+
+<% end -%>
+<% end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/terraforming.gemspec

@@ -19,17 +19,14 @@ 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.7"
-  spec.add_dependency "oj"
-  spec.add_dependency "ox"
+  spec.add_dependency "aws-sdk", "~> 2.3.0"
+  spec.add_dependency "oj", "~> 2.15.0"
+  spec.add_dependency "ox", "~> 2.4.0"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "codeclimate-test-reporter"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "coveralls", "~> 0.8.13"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "simplecov", "~> 0.11.1"
-  spec.add_development_dependency "terminal-notifier-guard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.15.0
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -81,35 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.13
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.1
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Export existing AWS resources to Terraform style (tf, tfstate)
 email:
 - dtanshi45@gmail.com
@@ -197,6 +155,7 @@ files:
 - README.md
 - Rakefile
 - bin/terraforming
+- contrib/zsh-completion/_terraforming
 - lib/terraforming.rb
 - lib/terraforming/cli.rb
 - lib/terraforming/resource/auto_scaling_group.rb
@@ -218,6 +177,7 @@ files:
 - lib/terraforming/resource/iam_user.rb
 - lib/terraforming/resource/iam_user_policy.rb
 - lib/terraforming/resource/internet_gateway.rb
+- lib/terraforming/resource/launch_configuration.rb
 - lib/terraforming/resource/network_acl.rb
 - lib/terraforming/resource/network_interface.rb
 - lib/terraforming/resource/rds.rb
@@ -228,8 +188,10 @@ files:
 - lib/terraforming/resource/route_table_association.rb
 - lib/terraforming/resource/s3.rb
 - lib/terraforming/resource/security_group.rb
+- lib/terraforming/resource/sqs.rb
 - lib/terraforming/resource/subnet.rb
 - lib/terraforming/resource/vpc.rb
+- lib/terraforming/resource/vpn_gateway.rb
 - lib/terraforming/template/tf/auto_scaling_group.erb
 - lib/terraforming/template/tf/db_parameter_group.erb
 - lib/terraforming/template/tf/db_security_group.erb
@@ -249,6 +211,7 @@ files:
 - lib/terraforming/template/tf/iam_user.erb
 - lib/terraforming/template/tf/iam_user_policy.erb
 - lib/terraforming/template/tf/internet_gateway.erb
+- lib/terraforming/template/tf/launch_configuration.erb
 - lib/terraforming/template/tf/network_acl.erb
 - lib/terraforming/template/tf/network_interface.erb
 - lib/terraforming/template/tf/rds.erb
@@ -259,8 +222,10 @@ files:
 - lib/terraforming/template/tf/route_table_association.erb
 - lib/terraforming/template/tf/s3.erb
 - lib/terraforming/template/tf/security_group.erb
+- lib/terraforming/template/tf/sqs.erb
 - lib/terraforming/template/tf/subnet.erb
 - lib/terraforming/template/tf/vpc.erb
+- lib/terraforming/template/tf/vpn_gateway.erb
 - lib/terraforming/util.rb
 - lib/terraforming/version.rb
 - script/console