terraforming 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 502313f532844e035b96fb9052978997e629d4c0
-  data.tar.gz: 9a4ef14fb66fd7513af3018e90de748382348326
+  metadata.gz: 0ab51ccecba0ce3d3701be95d8718f6d5fe6a796
+  data.tar.gz: 0032ebcb37559bd617d042347b12c8764c2a82f3
 SHA512:
-  metadata.gz: b5d3c73ba58880b5c3ed8342af91e6c6f1c86b51d4d733428a3bba1d7d22ac9779fc9ef6287a2d74a7281bc5ebd524f7f2ca2765907984e04e1ad4751b59d8a8
-  data.tar.gz: 4cf5db562aa5c62c11d5d40d1e01309d3433a85cccf82c661acaf89f9962755489ea0ed92bdee2d29977efb0369e803a553b84fc44c4833aa79d598e26d026f9
+  metadata.gz: de61ed94cc3077c1866602f6cf41f4298b02c0ce91105b8cae4d8c8054b45182feeb2318f531d574006d6fcb19c8302c26e7d2bb27c6257136ce90b3f038ff7a
+  data.tar.gz: a1a27835df34c2e8c2830cab7c578381c75fec982a55f4859f427d6af2ffb7e3a921120333897621b3e604622f5bf6154f4496d44e7950481a0e0b4a963d5f70

data/.rubocop.yml

@@ -0,0 +1,81 @@
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 140
+  Exclude:
+    - "spec/**/*"
+
+# Offense count: 42
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/EachWithObject:
+  Enabled: false
+
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+
+# TODO: check again
+Style/IndentArray:
+  Enabled: false
+
+# TODO: check again
+Style/IndentHash:
+  Enabled: false
+
+Style/LineEndConcatenation:
+  Enabled: false
+
+Style/MutableConstant:
+  Enabled: false
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/RedundantSelf:
+  Enabled: false
+
+# TODO: check again (force to %r literal)
+Style/RegexpLiteral:
+  Enabled: true
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/SymbolProc:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+Style/UnneededPercentQ:
+  Enabled: false
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: "map"
+    collect!: "map!"
+    inject: "inject"
+    detect: "find"
+    find_all: "select"

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# [v0.10.0](https://github.com/dtan4/terraforming/releases/tag/v0.10.0) (2016-08-24)
+
+## Resource
+
+- AWS NAT Gateway [#240](https://github.com/dtan4/terraforming/pull/240) (thanks @brianknight10)
+
+## Fixed / Updated
+
+- Use the latest Oj (2.17.x) [#257](https://github.com/dtan4/terraforming/pull/257)
+- Use the latest aws-sdk (2.5.x) [#256](https://github.com/dtan4/terraforming/pull/256)
+- Attach AWS-scoped IAM policy attachments [#251](https://github.com/dtan4/terraforming/pull/251) (thanks @raylu)
+- Fix LaunchConfiguration tf result when associate_public_ip_address [#250](https://github.com/dtan4/terraforming/pull/250) (thanks @gotyoooo)
+- Paginate IAM Group Membership [#248](https://github.com/dtan4/terraforming/pull/248) (thanks @raylu)
+- Add option to use AWS bundled CA certificate [#246](https://github.com/dtan4/terraforming/pull/246) (thanks @mattgartman)
+- Fix network_interface naming in EIP [#243](https://github.com/dtan4/terraforming/pull/243)
+- Fix name of "iampa" subcommand in CLI help output [#237](https://github.com/dtan4/terraforming/pull/237) (thanks @jimmycuadra)
+- Paginate all resources [#236](https://github.com/dtan4/terraforming/pull/236) (thanks @philsnow)
+
+__NOTE:__ OpsWorks support was omitted at v0.10.0 due to lack of tests. See [#264](https://github.com/dtan4/terraforming/pull/264) in detail.
+
+## Others
+
+- Introduce [RuboCop](https://github.com/bbatsov/rubocop) and [SideCI](https://sideci.com/) to check coding style automatically [#242](https://github.com/dtan4/terraforming/pull/242)
+
 # [v0.9.1](https://github.com/dtan4/terraforming/releases/tag/v0.9.1) (2016-06-17)
 
 ## Fixed / Updated

data/Gemfile

@@ -13,5 +13,7 @@ group :development do
     gem "listen", "< 3.1.0"
   end
 
+  gem "rubocop"
+
   gem "terminal-notifier-guard"
 end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Daisuke Fujita
+Copyright (c) 2015-2016 Daisuke Fujita
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -65,6 +65,12 @@ aws_secret_access_key = FugaFuga
 $ terraforming s3 --profile hoge
 ```
 
+You can force the AWS SDK to utilize the CA certificate that is bundled with the SDK for systems where the default OpenSSL certificate is not installed (e.g. Windows) by utilizing the `--use-bundled-cert` option.
+
+```bash
+PS C:\> terraforming ec2 --use-bundled-cert
+```
+
 ## Usage
 
 ```bash
@@ -79,13 +85,13 @@ Commands:
   terraforming ecsn            # ElastiCache Subnet Group
   terraforming eip             # EIP
   terraforming elb             # ELB
-  terraforming help [COMMAND]  # Describe available commands or one specifi...
+  terraforming help [COMMAND]  # Describe available commands or one specific command
   terraforming iamg            # IAM Group
   terraforming iamgm           # IAM Group Membership
   terraforming iamgp           # IAM Group Policy
   terraforming iamip           # IAM Instance Profile
   terraforming iamp            # IAM Policy
-  terraforming iamp            # IAM Policy Attachment
+  terraforming iampa           # IAM Policy Attachment
   terraforming iamr            # IAM Role
   terraforming iamrp           # IAM Role Policy
   terraforming iamu            # IAM User
@@ -93,6 +99,7 @@ Commands:
   terraforming igw             # Internet Gateway
   terraforming lc              # Launch Configuration
   terraforming nacl            # Network ACL
+  terraforming nat             # NAT Gateway
   terraforming nif             # Network Interface
   terraforming r53r            # Route53 Record
   terraforming r53z            # Route53 Hosted Zone

data/Rakefile

@@ -4,4 +4,3 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-

data/lib/terraforming.rb

@@ -3,7 +3,7 @@ require "oj"
 begin
   require "ox"
 rescue NameError => e
-  spec = Gem::Specification.stubs.find {|s| s.name == 'ox' }
+  spec = Gem::Specification.stubs.find { |s| s.name == 'ox' }
   raise e unless spec
   require File.join(spec.gem_dir, "lib/ox")
 end
@@ -39,6 +39,7 @@ require "terraforming/resource/iam_user"
 require "terraforming/resource/iam_user_policy"
 require "terraforming/resource/launch_configuration"
 require "terraforming/resource/internet_gateway"
+require "terraforming/resource/nat_gateway"
 require "terraforming/resource/network_acl"
 require "terraforming/resource/network_interface"
 require "terraforming/resource/rds"

data/lib/terraforming/cli.rb

@@ -5,6 +5,9 @@ module Terraforming
     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"
+    class_option :use_bundled_cert,
+                 type: :boolean,
+                 desc: "Use the bundled CA certificate from AWS SDK"
 
     desc "asg", "AutoScaling Group"
     def asg
@@ -76,7 +79,7 @@ module Terraforming
       execute(Terraforming::Resource::IAMPolicy, options)
     end
 
-    desc "iamp", "IAM Policy Attachment"
+    desc "iampa", "IAM Policy Attachment"
     def iampa
       execute(Terraforming::Resource::IAMPolicyAttachment, options)
     end
@@ -116,6 +119,11 @@ module Terraforming
       execute(Terraforming::Resource::NetworkACL, options)
     end
 
+    desc "nat", "NAT Gateway"
+    def nat
+      execute(Terraforming::Resource::NATGateway, options)
+    end
+
     desc "nif", "Network Interface"
     def nif
       execute(Terraforming::Resource::NetworkInterface, options)
@@ -181,12 +189,16 @@ module Terraforming
       execute(Terraforming::Resource::VPNGateway, options)
     end
 
-
     private
 
-    def execute(klass, options)
+    def configure_aws(options)
       Aws.config[:credentials] = Aws::SharedCredentials.new(profile_name: options[:profile]) if options[:profile]
       Aws.config[:region] = options[:region] if options[:region]
+      Aws.use_bundled_cert! if options[:use_bundled_cert]
+    end
+
+    def execute(klass, options)
+      configure_aws(options)
       result = options[:tfstate] ? tfstate(klass, options[:merge]) : tf(klass)
 
       if options[:tfstate] && options[:merge] && options[:overwrite]

data/lib/terraforming/resource/auto_scaling_group.rb

@@ -83,7 +83,7 @@ module Terraforming
       end
 
       def vpc_zone_specified?(group)
-        group.vpc_zone_identifier && vpc_zone_identifier_of(group).length > 0
+        group.vpc_zone_identifier && !vpc_zone_identifier_of(group).empty?
       end
     end
   end

data/lib/terraforming/resource/db_parameter_group.rb

@@ -43,11 +43,11 @@ module Terraforming
       private
 
       def db_parameter_groups
-        @client.describe_db_parameter_groups.db_parameter_groups
+        @client.describe_db_parameter_groups.map(&:db_parameter_groups).flatten
       end
 
       def db_parameters_in(parameter_group)
-        @client.describe_db_parameters(db_parameter_group_name: parameter_group.db_parameter_group_name).parameters
+        @client.describe_db_parameters(db_parameter_group_name: parameter_group.db_parameter_group_name).map(&:parameters).flatten
       end
 
       def module_name_of(parameter_group)

data/lib/terraforming/resource/db_security_group.rb

@@ -46,7 +46,7 @@ module Terraforming
       end
 
       def db_security_groups
-        @client.describe_db_security_groups.db_security_groups.select { |sg| ingresses_of(sg).length > 0 }
+        @client.describe_db_security_groups.map(&:db_security_groups).flatten.select { |sg| !ingresses_of(sg).empty? }
       end
 
       def module_name_of(security_group)

data/lib/terraforming/resource/db_subnet_group.rb

@@ -41,7 +41,7 @@ module Terraforming
       private
 
       def db_subnet_groups
-        @client.describe_db_subnet_groups.db_subnet_groups
+        @client.describe_db_subnet_groups.map(&:db_subnet_groups).flatten
       end
 
       def module_name_of(subnet_group)

data/lib/terraforming/resource/ec2.rb

@@ -25,24 +25,24 @@ module Terraforming
           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.#"=> ebs_block_devices_in(block_devices, instance).length.to_s,
-            "ebs_optimized"=> instance.ebs_optimized.to_s,
+            "ami" => instance.image_id,
+            "associate_public_ip_address" => "true",
+            "availability_zone" => instance.placement.availability_zone,
+            "ebs_block_device.#" => ebs_block_devices_in(block_devices, instance).length.to_s,
+            "ebs_optimized" => instance.ebs_optimized.to_s,
             "ephemeral_block_device.#" => "0", # Terraform 0.6.1 cannot fetch this field from AWS
-            "id"=> instance.instance_id,
-            "instance_type"=> instance.instance_type,
+            "id" => instance.instance_id,
+            "instance_type" => instance.instance_type,
             "monitoring" => monitoring_state(instance).to_s,
-            "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.#"=> 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,
-            "tenancy"=> instance.placement.tenancy,
-            "vpc_security_group_ids.#"=> in_vpc ? instance.security_groups.length.to_s : "0",
+            "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.#" => 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,
+            "tenancy" => instance.placement.tenancy,
+            "vpc_security_group_ids.#" => in_vpc ? instance.security_groups.length.to_s : "0",
           }
 
           placement_group = instance.placement.group_name
@@ -72,8 +72,8 @@ module Terraforming
       end
 
       def block_devices_of(instance)
-        return [] unless instance.block_device_mappings.length > 0
-        @client.describe_volumes(volume_ids: block_device_ids_of(instance)).volumes
+        return [] if instance.block_device_mappings.empty?
+        @client.describe_volumes(volume_ids: block_device_ids_of(instance)).map(&:volumes).flatten
       end
 
       def block_device_mapping_of(instance, volume_id)
@@ -92,8 +92,8 @@ module Terraforming
       #     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)
+        !vpc_security_groups_of(instance).empty? ||
+          (instance.subnet_id && instance.subnet_id != "" && instance.security_groups.empty?)
       end
 
       def monitoring_state(instance)
@@ -101,7 +101,9 @@ module Terraforming
       end
 
       def instances
-        @client.describe_instances.reservations.map(&:instances).flatten.reject { |instance| instance.state.name == "terminated" }
+        @client.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.reject do |instance|
+          instance.state.name == "terminated"
+        end
       end
 
       def module_name_of(instance)

data/lib/terraforming/resource/eip.rb

@@ -29,9 +29,9 @@ module Terraforming
             "network_interface" => addr.network_interface_id,
             "private_ip" => addr.private_ip_address,
             "public_ip" => addr.public_ip,
-            "vpc" => is_vpc?(addr).to_s,
+            "vpc" => vpc?(addr).to_s,
           }
-          attributes.delete_if{|k, v| v.nil?}
+          attributes.delete_if { |_k, v| v.nil? }
           resources["aws_eip.#{addr.allocation_id}"] = {
             "type" => "aws_eip",
             "primary" => {
@@ -47,10 +47,10 @@ module Terraforming
       private
 
       def eips
-        @client.describe_addresses.addresses
+        @client.describe_addresses.map(&:addresses).flatten
       end
 
-      def is_vpc?(addr)
+      def vpc?(addr)
         addr.domain.eql?("vpc")
       end
     end

data/lib/terraforming/resource/elasti_cache_cluster.rb

@@ -37,10 +37,10 @@ module Terraforming
           }
 
           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
+                                 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",
@@ -57,11 +57,11 @@ module Terraforming
       private
 
       def cache_clusters
-        @client.describe_cache_clusters(show_cache_node_info: true).cache_clusters
+        @client.describe_cache_clusters(show_cache_node_info: true).map(&:cache_clusters).flatten
       end
 
       def cluster_in_vpc?(cache_cluster)
-        cache_cluster.cache_security_groups.length == 0
+        cache_cluster.cache_security_groups.empty?
       end
 
       def security_group_ids_of(cache_cluster)

data/lib/terraforming/resource/elasti_cache_subnet_group.rb

@@ -41,7 +41,7 @@ module Terraforming
       private
 
       def cache_subnet_groups
-        @client.describe_cache_subnet_groups.cache_subnet_groups
+        @client.describe_cache_subnet_groups.map(&:cache_subnet_groups).flatten
       end
 
       def subnet_ids_of(cache_subnet_group)

data/lib/terraforming/resource/elb.rb

@@ -48,7 +48,6 @@ module Terraforming
           attributes.merge!(instances_attributes_of(load_balancer))
           attributes.merge!(tags_attributes_of(load_balancer))
 
-
           resources["aws_elb.#{module_name_of(load_balancer)}"] = {
             "type" => "aws_elb",
             "primary" => {
@@ -106,7 +105,7 @@ module Terraforming
 
       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}
+        attributes = { "tags.#" => tags.length.to_s }
 
         tags.each do |tag|
           attributes["tags.#{tag.key}"] = tag.value
@@ -116,7 +115,7 @@ module Terraforming
       end
 
       def instances_attributes_of(elb)
-        attributes = {"instances.#" => elb.instances.length.to_s}
+        attributes = { "instances.#" => elb.instances.length.to_s }
 
         elb.instances.each do |instance|
           attributes["instances.#{Zlib.crc32(instance.instance_id)}"] = instance.instance_id
@@ -126,7 +125,7 @@ module Terraforming
       end
 
       def subnets_attributes_of(elb)
-        attributes = {"subnets.#" => elb.subnets.length.to_s}
+        attributes = { "subnets.#" => elb.subnets.length.to_s }
 
         elb.subnets.each do |subnet_id|
           attributes["subnets.#{Zlib.crc32(subnet_id)}"] = subnet_id
@@ -136,7 +135,7 @@ module Terraforming
       end
 
       def sg_attributes_of(elb)
-        attributes = {"security_groups.#" => elb.security_groups.length.to_s}
+        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
@@ -146,7 +145,7 @@ module Terraforming
       end
 
       def listeners_attributes_of(elb)
-        attributes = {"listener.#" => elb.listener_descriptions.length.to_s}
+        attributes = { "listener.#" => elb.listener_descriptions.length.to_s }
 
         elb.listener_descriptions.each do |listener_description|
           attributes.merge!(listener_attributes_of(listener_description.listener))
@@ -181,7 +180,7 @@ module Terraforming
       end
 
       def load_balancers
-        @client.describe_load_balancers.load_balancer_descriptions
+        @client.describe_load_balancers.map(&:load_balancer_descriptions).flatten
       end
 
       def load_balancer_attributes_of(load_balancer)

data/lib/terraforming/resource/iam_group.rb

@@ -22,7 +22,7 @@ module Terraforming
       def tfstate
         iam_groups.inject({}) do |resources, group|
           attributes = {
-            "arn"=> group.arn,
+            "arn" => group.arn,
             "id" => group.group_name,
             "name" => group.group_name,
             "path" => group.path,
@@ -43,7 +43,7 @@ module Terraforming
       private
 
       def iam_groups
-        @client.list_groups.collect {|r| r.groups}.flatten
+        @client.list_groups.map(&:groups).flatten
       end
     end
   end

data/lib/terraforming/resource/iam_group_membership.rb

@@ -24,7 +24,7 @@ module Terraforming
           membership_name = membership_name_of(group)
 
           attributes = {
-            "group"=> group.group_name,
+            "group" => group.group_name,
             "id" => membership_name,
             "name" => membership_name,
             "users.#" => group_members_of(group).length.to_s,
@@ -44,11 +44,11 @@ module Terraforming
       private
 
       def group_members_of(group)
-        @client.get_group(group_name: group.group_name).users.map { |user| user.user_name }
+        @client.get_group(group_name: group.group_name).map(&:users).flatten.map(&:user_name)
       end
 
       def iam_groups
-        @client.list_groups.groups
+        @client.list_groups.map(&:groups).flatten
       end
 
       def membership_name_of(group)

data/lib/terraforming/resource/iam_group_policy.rb

@@ -45,14 +45,14 @@ module Terraforming
         "#{policy.group_name}_#{policy.policy_name}"
       end
 
-      def iam_groups
-        @client.list_groups.groups
-      end
-
       def iam_group_policy_id_of(policy)
         "#{policy.group_name}:#{policy.policy_name}"
       end
 
+      def iam_groups
+        @client.list_groups.map(&:groups).flatten
+      end
+
       def iam_group_policy_names_in(group)
         @client.list_group_policies(group_name: group.group_name).policy_names
       end

data/lib/terraforming/resource/iam_instance_profile.rb

@@ -43,7 +43,7 @@ module Terraforming
       private
 
       def iam_instance_profiles
-        @client.list_instance_profiles.instance_profiles
+        @client.list_instance_profiles.map(&:instance_profiles).flatten
       end
     end
   end

data/lib/terraforming/resource/iam_policy.rb

@@ -44,7 +44,7 @@ module Terraforming
       private
 
       def iam_policies
-        @client.list_policies(scope: "Local").collect {|r| r.policies}.flatten
+        @client.list_policies(scope: "Local").map(&:policies).flatten
       end
 
       def iam_policy_description(policy)

data/lib/terraforming/resource/iam_policy_attachment.rb

@@ -48,11 +48,24 @@ module Terraforming
       end
 
       def entities_for_policy(policy)
-        @client.list_entities_for_policy(policy_arn: policy.arn)
+        # list_entities_for_policy is a weird one: the response class
+        # has three different member variables that we need to
+        # paginate through altogether.
+        result = Aws::IAM::Types::ListEntitiesForPolicyResponse.new
+        result.policy_groups = []
+        result.policy_users = []
+        result.policy_roles = []
+        @client.list_entities_for_policy(policy_arn: policy.arn).each do |resp|
+          result.policy_groups += resp.policy_groups
+          result.policy_users += resp.policy_users
+          result.policy_roles += resp.policy_roles
+        end
+
+        result
       end
 
       def iam_policies
-        @client.list_policies(scope: "Local").policies
+        @client.list_policies(scope: "All", only_attached: true).map(&:policies).flatten
       end
 
       def iam_policy_attachments

data/lib/terraforming/resource/iam_role.rb

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

data/lib/terraforming/resource/iam_role_policy.rb

@@ -45,14 +45,14 @@ module Terraforming
         "#{policy.role_name}_#{policy.policy_name}"
       end
 
-      def iam_roles
-        @client.list_roles.roles
-      end
-
       def iam_role_policy_id_of(policy)
         "#{policy.role_name}:#{policy.policy_name}"
       end
 
+      def iam_roles
+        @client.list_roles.map(&:roles).flatten
+      end
+
       def iam_role_policy_names_in(role)
         @client.list_role_policies(role_name: role.role_name).policy_names
       end

data/lib/terraforming/resource/iam_user.rb

@@ -22,7 +22,7 @@ module Terraforming
       def tfstate
         iam_users.inject({}) do |resources, user|
           attributes = {
-            "arn"=> user.arn,
+            "arn" => user.arn,
             "id" => user.user_name,
             "name" => user.user_name,
             "path" => user.path,
@@ -43,7 +43,7 @@ module Terraforming
       private
 
       def iam_users
-        @client.list_users.collect {|r| r.users}.flatten
+        @client.list_users.map(&:users).flatten
       end
 
       def module_name_of(user)

data/lib/terraforming/resource/iam_user_policy.rb

@@ -45,14 +45,14 @@ module Terraforming
         "#{policy.user_name}_#{policy.policy_name}"
       end
 
-      def iam_users
-        @client.list_users.users
-      end
-
       def iam_user_policy_id_of(policy)
         "#{policy.user_name}:#{policy.policy_name}"
       end
 
+      def iam_users
+        @client.list_users.map(&:users).flatten
+      end
+
       def iam_user_policy_names_in(user)
         @client.list_user_policies(user_name: user.user_name).policy_names
       end

data/lib/terraforming/resource/internet_gateway.rb

@@ -43,7 +43,7 @@ module Terraforming
       private
 
       def internet_gateways
-        @client.describe_internet_gateways.internet_gateways
+        @client.describe_internet_gateways.map(&:internet_gateways).flatten
       end
 
       def module_name_of(internet_gateway)

data/lib/terraforming/resource/launch_configuration.rb

@@ -21,7 +21,6 @@ module Terraforming
 
       def tfstate
         launch_configurations.inject({}) do |resources, lc|
-
           attributes = {
             "name" => lc.launch_configuration_name,
             "image_id" => lc.image_id,
@@ -72,7 +71,7 @@ module Terraforming
       end
 
       def ebs_block_device?(block_device)
-        block_device.virtual_name == nil && block_device.ebs
+        block_device.virtual_name.nil? && block_device.ebs
       end
 
       def ebs_block_device_count(launch_configuration)
@@ -96,9 +95,7 @@ module Terraforming
       end
 
       def launch_configurations
-        @client.describe_launch_configurations.collect do |r|
-          r.launch_configurations
-        end.flatten
+        @client.describe_launch_configurations.map(&:launch_configurations).flatten
       end
 
       def module_name_of(launch_configuration)

data/lib/terraforming/resource/nat_gateway.rb

@@ -0,0 +1,57 @@
+module Terraforming
+  module Resource
+    class NATGateway
+      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/nat_gateway")
+      end
+
+      def tfstate
+        nat_gateways.inject({}) do |resources, nat_gateway|
+          next resources if nat_gateway.nat_gateway_addresses.empty?
+
+          attributes = {
+            "id" => nat_gateway.nat_gateway_id,
+            "allocation_id" => nat_gateway.nat_gateway_addresses[0].allocation_id,
+            "subnet_id" => nat_gateway.subnet_id,
+            "network_inferface_id" => nat_gateway.nat_gateway_addresses[0].network_interface_id,
+            "private_ip" => nat_gateway.nat_gateway_addresses[0].private_ip,
+            "public_ip" => nat_gateway.nat_gateway_addresses[0].public_ip,
+          }
+          resources["aws_nat_gateway.#{module_name_of(nat_gateway)}"] = {
+            "type" => "aws_nat_gateway",
+            "primary" => {
+              "id"         => nat_gateway.nat_gateway_id,
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def nat_gateways
+        @client.describe_nat_gateways.nat_gateways
+      end
+
+      def module_name_of(nat_gateway)
+        normalize_module_name(nat_gateway.nat_gateway_id)
+      end
+    end
+  end
+end

data/lib/terraforming/resource/network_acl.rb

@@ -68,7 +68,7 @@ module Terraforming
       end
 
       def network_acls
-        @client.describe_network_acls.network_acls
+        @client.describe_network_acls.map(&:network_acls).flatten
       end
 
       def subnet_ids_of(network_acl)

data/lib/terraforming/resource/network_interface.rb

@@ -49,7 +49,7 @@ module Terraforming
       end
 
       def private_ips_of(network_interface)
-        network_interface.private_ip_addresses.map{|addr| addr.private_ip_address }
+        network_interface.private_ip_addresses.map { |addr| addr.private_ip_address }
       end
 
       def security_groups_of(network_interface)
@@ -61,9 +61,8 @@ module Terraforming
       end
 
       def network_interfaces
-        @client.describe_network_interfaces.network_interfaces
+        @client.describe_network_interfaces.map(&:network_interfaces).flatten
       end
-
     end
   end
 end

data/lib/terraforming/resource/rds.rb

@@ -63,7 +63,7 @@ module Terraforming
       private
 
       def db_instances
-        @client.describe_db_instances.db_instances
+        @client.describe_db_instances.map(&:db_instances).flatten
       end
 
       def module_name_of(instance)

data/lib/terraforming/resource/redshift.rb

@@ -56,7 +56,7 @@ module Terraforming
       private
 
       def clusters
-        @client.describe_clusters.clusters
+        @client.describe_clusters.map(&:clusters).flatten
       end
 
       def module_name_of(cluster)

data/lib/terraforming/resource/route53_record.rb

@@ -25,8 +25,8 @@ module Terraforming
           record_id = record_id_of(record, zone_id)
 
           attributes = {
-            "id"=> record_id,
-            "name"=> name_of(record.name.gsub(/\\052/, '*')),
+            "id" => record_id,
+            "name" => name_of(record.name.gsub(/\\052/, '*')),
             "type" => record.type,
             "zone_id" => zone_id,
           }
@@ -52,7 +52,7 @@ module Terraforming
       private
 
       def hosted_zones
-        @client.list_hosted_zones.hosted_zones
+        @client.list_hosted_zones.map(&:hosted_zones).flatten
       end
 
       def record_id_of(record, zone_id)
@@ -81,7 +81,7 @@ module Terraforming
       end
 
       def zone_id_of(hosted_zone)
-        hosted_zone.id.gsub(/\A\/hostedzone\//, "")
+        hosted_zone.id.gsub(%r{\A/hostedzone/}, "")
       end
     end
   end

data/lib/terraforming/resource/route53_zone.rb

@@ -25,9 +25,9 @@ module Terraforming
           vpc = vpc_of(hosted_zone)
 
           attributes = {
-            "comment"=> comment_of(hosted_zone),
-            "id"=> zone_id,
-            "name"=> name_of(hosted_zone),
+            "comment" => comment_of(hosted_zone),
+            "id" => zone_id,
+            "name" => name_of(hosted_zone),
             "name_servers.#" => name_servers_of(hosted_zone).length.to_s,
             "tags.#" => tags_of(hosted_zone).length.to_s,
             "vpc_id" => vpc ? vpc.vpc_id : "",
@@ -49,7 +49,7 @@ module Terraforming
       private
 
       def hosted_zones
-        @client.list_hosted_zones.hosted_zones.map { |hosted_zone| @client.get_hosted_zone(id: hosted_zone.id) }
+        @client.list_hosted_zones.map(&:hosted_zones).flatten.map { |hosted_zone| @client.get_hosted_zone(id: hosted_zone.id) }
       end
 
       def tags_of(hosted_zone)
@@ -82,7 +82,7 @@ module Terraforming
       end
 
       def zone_id_of(hosted_zone)
-        hosted_zone.hosted_zone.id.gsub(/\A\/hostedzone\//, "")
+        hosted_zone.hosted_zone.id.gsub(%r{\A/hostedzone/}, "")
       end
     end
   end

data/lib/terraforming/resource/route_table.rb

@@ -47,8 +47,8 @@ module Terraforming
       def routes_of(route_table)
         route_table.routes.reject do |route|
           route.gateway_id.to_s == 'local' ||
-          route.origin.to_s == 'EnableVgwRoutePropagation' ||
-          route.destination_prefix_list_id
+            route.origin.to_s == 'EnableVgwRoutePropagation' ||
+            route.destination_prefix_list_id
         end
       end
 
@@ -57,7 +57,7 @@ module Terraforming
       end
 
       def route_tables
-        @client.describe_route_tables.route_tables
+        @client.describe_route_tables.map(&:route_tables).flatten
       end
 
       def routes_attributes_of(route_table)

data/lib/terraforming/resource/route_table_association.rb

@@ -52,7 +52,7 @@ module Terraforming
       end
 
       def route_tables
-        @client.describe_route_tables.route_tables
+        @client.describe_route_tables.map(&:route_tables).flatten
       end
     end
   end

data/lib/terraforming/resource/s3.rb

@@ -53,7 +53,7 @@ module Terraforming
       end
 
       def buckets
-        @client.list_buckets.buckets.select { |bucket| same_region?(bucket) }
+        @client.list_buckets.map(&:buckets).flatten.select { |bucket| same_region?(bucket) }
       end
 
       def module_name_of(bucket)

data/lib/terraforming/resource/security_group.rb

@@ -75,7 +75,7 @@ module Terraforming
 
       def module_name_of(security_group)
         if security_group.vpc_id.nil?
-          normalize_module_name("#{security_group.group_name}")
+          normalize_module_name(security_group.group_name.to_s)
         else
           normalize_module_name("#{security_group.vpc_id}-#{security_group.group_name}")
         end
@@ -83,8 +83,9 @@ module Terraforming
 
       def permission_attributes_of(security_group, permission, type)
         hashcode = permission_hashcode_of(security_group, permission)
-        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 }
-
+        security_groups = security_groups_in(permission, security_group).reject do |identifier|
+          [security_group.group_name, security_group.group_id].include?(identifier)
+        end
 
         attributes = {
           "#{type}.#{hashcode}.from_port" => (permission.from_port || 0).to_s,
@@ -140,7 +141,7 @@ module Terraforming
           "#{permission.from_port || 0}-" <<
           "#{permission.to_port || 0}-" <<
           "#{permission.ip_protocol}-" <<
-          "#{self_referenced_permission?(security_group, permission).to_s}-"
+          "#{self_referenced_permission?(security_group, permission)}-"
 
         permission.ip_ranges.each { |range| string << "#{range.cidr_ip}-" }
         security_groups_in(permission, security_group).each { |group| string << "#{group}-" }
@@ -153,11 +154,11 @@ module Terraforming
       end
 
       def security_groups
-        @client.describe_security_groups.security_groups
+        @client.describe_security_groups.map(&:security_groups).flatten
       end
 
       def security_groups_in(permission, security_group)
-        permission.user_id_group_pairs.map { |range|
+        permission.user_id_group_pairs.map do |range|
           # EC2-Classic, same account
           if security_group.owner_id == range.user_id && !range.group_name.nil?
             range.group_name
@@ -168,7 +169,7 @@ module Terraforming
           else
             "#{range.user_id}/#{range.group_name}"
           end
-        }
+        end
       end
 
       def tags_attributes_of(security_group)

data/lib/terraforming/resource/sqs.rb

@@ -59,7 +59,7 @@ module Terraforming
       end
 
       def queue_urls
-        @client.list_queues.queue_urls
+        @client.list_queues.map(&:queue_urls).flatten
       end
 
       def module_name_of(queue)

data/lib/terraforming/resource/subnet.rb

@@ -44,7 +44,7 @@ module Terraforming
       private
 
       def subnets
-        @client.describe_subnets.subnets
+        @client.describe_subnets.map(&:subnets).flatten
       end
 
       def module_name_of(subnet)

data/lib/terraforming/resource/vpc.rb

@@ -56,7 +56,7 @@ module Terraforming
       end
 
       def vpcs
-        @client.describe_vpcs.vpcs
+        @client.describe_vpcs.map(&:vpcs).flatten
       end
 
       def vpc_attribute(vpc, attribute)

data/lib/terraforming/resource/vpn_gateway.rb

@@ -44,7 +44,7 @@ module Terraforming
       private
 
       def vpn_gateways
-        @client.describe_vpn_gateways.vpn_gateways
+        @client.describe_vpn_gateways.map(&:vpn_gateways).flatten
       end
 
       def module_name_of(vpn_gateway)

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

@@ -1,11 +1,11 @@
 <% eips.each do |addr| -%>
 resource "aws_eip" "<%= addr.allocation_id %>" {
 <% if addr.instance_id -%>
-    instance             = "<%= addr.instance_id %>"
+    instance          = "<%= addr.instance_id %>"
 <% elsif addr.network_interface_id -%>
-    network_interface_id = "<%= addr.network_interface_id %>"
+    network_interface = "<%= addr.network_interface_id %>"
 <% end -%>
-    vpc                  = <%= is_vpc?(addr) %>
+    vpc               = <%= vpc?(addr) %>
 }
 
 <% end -%>

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

@@ -10,7 +10,9 @@ resource "aws_launch_configuration" "<%= module_name_of(launch_configuration) %>
     key_name                    = "<%= launch_configuration.key_name %>"
 <%- end -%>
     security_groups             = <%= launch_configuration.security_groups.map { |sg| sg }.inspect %>
+<%- unless launch_configuration.associate_public_ip_address.nil? -%>
     associate_public_ip_address = <%= launch_configuration.associate_public_ip_address %>
+<%- end -%>
  <%- unless launch_configuration.user_data.empty? -%>
     user_data                   = "<%= launch_configuration.user_data %>"
 <%- end -%>

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

@@ -0,0 +1,9 @@
+<% nat_gateways.each do |nat_gateway| -%>
+<% unless nat_gateway.nat_gateway_addresses.empty? -%>
+resource "aws_nat_gateway" "<%= module_name_of(nat_gateway) %>" {
+    allocation_id = "<%= nat_gateway.nat_gateway_addresses[0].allocation_id %>"
+    subnet_id = "<%= nat_gateway.subnet_id %>"
+}
+
+<% end -%>
+<% end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/terraforming.gemspec

@@ -19,8 +19,8 @@ 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.3.0"
-  spec.add_dependency "oj", "~> 2.15.0"
+  spec.add_dependency "aws-sdk", "~> 2.5.1"
+  spec.add_dependency "oj", "~> 2.17.1"
   spec.add_dependency "ox", "~> 2.4.0"
   spec.add_dependency "thor"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.17.1
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -179,6 +180,7 @@ files:
 - lib/terraforming/resource/iam_user_policy.rb
 - lib/terraforming/resource/internet_gateway.rb
 - lib/terraforming/resource/launch_configuration.rb
+- lib/terraforming/resource/nat_gateway.rb
 - lib/terraforming/resource/network_acl.rb
 - lib/terraforming/resource/network_interface.rb
 - lib/terraforming/resource/rds.rb
@@ -214,6 +216,7 @@ files:
 - 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/nat_gateway.erb
 - lib/terraforming/template/tf/network_acl.erb
 - lib/terraforming/template/tf/network_interface.erb
 - lib/terraforming/template/tf/rds.erb