terraforming 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67886dcb207d5bb56ceaf16ca3051f771f65ffad
-  data.tar.gz: 35ba0a5d88adec6d84fc14af5966c505ab81ac00
+  metadata.gz: 81391c43ae75be098888ffb552b0862b5eb84ff3
+  data.tar.gz: 2b3697639b6a79b2ad1bd9f3ad2e668cda9d36be
 SHA512:
-  metadata.gz: 6fe49e3e0d6e45c8f13fb0750b4021cddc09ebe73c7c6ac4db95914a72cfb9c55be583c875586a837b030c6190ad313e73529bedd09f5828ce23c72080ae9b16
-  data.tar.gz: 5b120fdc4fe6039ad4883408b994d69042cde5c62f30fd5cb2ffb259a213d1d257341b3374cc257c6db7bd928f6169ea356b32368a7332e6e1ef6b38a276e346
+  metadata.gz: daf32d71dc7f775cef0faa84393dc92b7928273a07fe105fb8caa9fe2cda864d061f7fbd6189fab963194d2816dd49f0e19ac82903c4bf07f74e19727194a600
+  data.tar.gz: b025806af68fff47061a5160a3018a271ef5d9ef6e0d55630d9d3f7fb218de2c3d4df146507956d256fef8d337007d8899edaa233aa8350dcd9289a08a0ffb7b

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-- 2.2.3
-- 2.1.7
+- 2.3.0
+- 2.2.4
+- 2.1.8
 - 2.0
 env:
 - secure: n0mxwnyjuXI4mJO4mp++2TnsPJ+XgCF/J1U2L5piE5j3xMhSU+5V0JrA1uFlS0Pemb44M7BjgmF9S4G35BwyAQpctpCYhqy9tFa6+Y6nxEv5hCv2cZz7BSAZM6eb+zq20409hxTHRaQOr1DBeE4R5S2PrmOXRqvYfTRv3LNSLFk=

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [v0.7.0](https://github.com/dtan4/terraforming/releases/tag/v0.6.2) (2016-02-16)
+
+## Resource
+
+- AWS Internet Gateway #164 (thanks @manabusakai)
+- AWS Redshift #161 (thanks @manabusakai)
+
+## Fixed
+
+- Modify AutoScaling Group tags format #167
+- Support paging for Route53 records #160 (thanks @seanodonnell)
+- Support paging for IAM user call #157 (thanks @crazed)
+
 # [v0.6.2](https://github.com/dtan4/terraforming/releases/tag/v0.6.2) (2015-12-11)
 
 ## Fixed

data/README.md

@@ -49,7 +49,7 @@ You need to set AWS credentials.
 ```bash
 export AWS_ACCESS_KEY_ID=XXXXXXXXXXXXXXXXXXXX
 export AWS_SECRET_ACCESS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-export AWS_DEFAULT_REGION=xx-yyyy-0
+export AWS_REGION=xx-yyyy-0
 ```
 
 You can also specify credential profile in `~/.aws/credentials` by `--profile` option.
@@ -76,6 +76,7 @@ Commands:
   terraforming ec2             # EC2
   terraforming ecc             # ElastiCache Cluster
   terraforming ecsn            # ElastiCache Subnet Group
+  terraforming eip             # EIP
   terraforming elb             # ELB
   terraforming iamg            # IAM Group
   terraforming iamgm           # IAM Group Membership
@@ -86,10 +87,13 @@ Commands:
   terraforming iamrp           # IAM Role Policy
   terraforming iamu            # IAM User
   terraforming iamup           # IAM User Policy
+  terraforming igw             # Internet Gateway
   terraforming nacl            # Network ACL
+  terraforming nif             # Network Interface
   terraforming r53r            # Route53 Record
   terraforming r53z            # Route53 Hosted Zone
   terraforming rds             # RDS
+  terraforming rs              # Redshift
   terraforming rt              # Route Table
   terraforming rta             # Route Table Association
   terraforming s3              # S3
@@ -326,7 +330,7 @@ $ docker run \
     --name terraforming \
     -e AWS_ACCESS_KEY_ID=XXXXXXXXXXXXXXXXXXXX \
     -e AWS_SECRET_ACCESS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \
-    -e AWS_DEFAULT_REGION=xx-yyyy-0 \
+    -e AWS_REGION=xx-yyyy-0 \
     quay.io/dtan4/terraforming:latest \
     terraforming s3
 ```

data/lib/terraforming.rb

@@ -29,9 +29,11 @@ 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/internet_gateway"
 require "terraforming/resource/network_acl"
 require "terraforming/resource/network_interface"
 require "terraforming/resource/rds"
+require "terraforming/resource/redshift"
 require "terraforming/resource/route_table"
 require "terraforming/resource/route_table_association"
 require "terraforming/resource/route53_record"

data/lib/terraforming/cli.rb

@@ -95,6 +95,11 @@ module Terraforming
       execute(Terraforming::Resource::IAMUserPolicy, options)
     end
 
+    desc "igw", "Internet Gateway"
+    def igw
+      execute(Terraforming::Resource::InternetGateway, options)
+    end
+
     desc "nacl", "Network ACL"
     def nacl
       execute(Terraforming::Resource::NetworkACL, options)
@@ -120,6 +125,11 @@ module Terraforming
       execute(Terraforming::Resource::RDS, options)
     end
 
+    desc "rs", "Redshift"
+    def rs
+      execute(Terraforming::Resource::Redshift, options)
+    end
+
     desc "rt", "Route Table"
     def rt
       execute(Terraforming::Resource::RouteTable, options)

data/lib/terraforming/resource/iam_user.rb

@@ -43,7 +43,7 @@ module Terraforming
       private
 
       def iam_users
-        @client.list_users.users
+        @client.list_users.collect {|r| r.users}.flatten
       end
 
       def module_name_of(user)

data/lib/terraforming/resource/internet_gateway.rb

@@ -0,0 +1,54 @@
+module Terraforming
+  module Resource
+    class InternetGateway
+      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/internet_gateway")
+      end
+
+      def tfstate
+        internet_gateways.inject({}) do |resources, internet_gateway|
+          next resources if internet_gateway.attachments.empty?
+
+          attributes = {
+            "id"     => internet_gateway.internet_gateway_id,
+            "vpc_id" => internet_gateway.attachments[0].vpc_id,
+            "tags.#" => internet_gateway.tags.length.to_s,
+          }
+          resources["aws_internet_gateway.#{module_name_of(internet_gateway)}"] = {
+            "type" => "aws_internet_gateway",
+            "primary" => {
+              "id"         => internet_gateway.internet_gateway_id,
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def internet_gateways
+        @client.describe_internet_gateways.internet_gateways
+      end
+
+      def module_name_of(internet_gateway)
+        normalize_module_name(name_from_tag(internet_gateway, internet_gateway.internet_gateway_id))
+      end
+    end
+  end
+end

data/lib/terraforming/resource/redshift.rb

@@ -0,0 +1,67 @@
+module Terraforming
+  module Resource
+    class Redshift
+      include Terraforming::Util
+
+      def self.tf(client: Aws::Redshift::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::Redshift::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/redshift")
+      end
+
+      def tfstate
+        clusters.inject({}) do |resources, cluster|
+          attributes = {
+            "cluster_identifier"                  => cluster.cluster_identifier,
+            "cluster_type"                        => cluster.number_of_nodes == 1 ? "single-node" : "multi-node",
+            "node_type"                           => cluster.node_type,
+            "master_password"                     => "xxxxxxxx",
+            "master_username"                     => cluster.master_username,
+            "availability_zone"                   => cluster.availability_zone,
+            "preferred_maintenance_window"        => cluster.preferred_maintenance_window,
+            "cluster_parameter_group_name"        => cluster.cluster_parameter_groups[0].parameter_group_name,
+            "automated_snapshot_retention_period" => cluster.automated_snapshot_retention_period.to_s,
+            "port"                                => cluster.endpoint.port.to_s,
+            "cluster_version"                     => cluster.cluster_version,
+            "allow_version_upgrade"               => cluster.allow_version_upgrade.to_s,
+            "number_of_nodes"                     => cluster.number_of_nodes.to_s,
+            "publicly_accessible"                 => cluster.publicly_accessible.to_s,
+            "encrypted"                           => cluster.encrypted.to_s,
+            "skip_final_snapshot"                 => "true",
+          }
+          attributes["database_name"] = cluster.db_name if cluster.db_name
+
+          resources["aws_redshift_cluster.#{module_name_of(cluster)}"] = {
+            "type" => "aws_redshift_cluster",
+            "primary" => {
+              "id" => cluster.cluster_identifier,
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def clusters
+        @client.describe_clusters.clusters
+      end
+
+      def module_name_of(cluster)
+        normalize_module_name(cluster.cluster_identifier)
+      end
+    end
+  end
+end

data/lib/terraforming/resource/route53_record.rb

@@ -60,7 +60,9 @@ module Terraforming
       end
 
       def record_sets_of(hosted_zone)
-        @client.list_resource_record_sets(hosted_zone_id: zone_id_of(hosted_zone)).resource_record_sets
+        @client.list_resource_record_sets(hosted_zone_id: zone_id_of(hosted_zone)).map do |response|
+          response.data.resource_record_sets
+        end.flatten
       end
 
       def records

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

@@ -15,13 +15,14 @@ resource "aws_autoscaling_group" "<%= module_name_of(group) %>" {
     vpc_zone_identifier       = <%= vpc_zone_identifier_of(group).inspect %>
 <%- end -%>
 
-    tag {
 <% group.tags.each do |tag| -%>
+    tag {
         key   = "<%= tag.key %>"
         value = "<%= tag.value %>"
         propagate_at_launch = <%= tag.propagate_at_launch.to_s %>
-<% end -%>
     }
+
+<% end -%>
 }
 
 <% end -%>

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

@@ -0,0 +1,14 @@
+<% internet_gateways.each do |internet_gateway| -%>
+<% unless internet_gateway.attachments.empty? -%>
+resource "aws_internet_gateway" "<%= module_name_of(internet_gateway) %>" {
+    vpc_id = "<%= internet_gateway.attachments[0].vpc_id %>"
+
+    tags {
+<% internet_gateway.tags.each do |tag| -%>
+        "<%= tag.key %>" = "<%= tag.value %>"
+<% end -%>
+    }
+}
+
+<% end -%>
+<% end -%>

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

@@ -0,0 +1,23 @@
+<% clusters.each do |cluster| -%>
+resource "aws_redshift_cluster" "<%= cluster.cluster_identifier %>" {
+    cluster_identifier                  = "<%= cluster.cluster_identifier %>"
+<%- if cluster.db_name -%>
+    database_name                       = "<%= cluster.db_name %>"
+<%- end -%>
+    cluster_type                        = "<%= cluster.number_of_nodes == 1 ? "single-node" : "multi-node" %>"
+    node_type                           = "<%= cluster.node_type %>"
+    master_password                     = "xxxxxxxx"
+    master_username                     = "<%= cluster.master_username %>"
+    availability_zone                   = "<%= cluster.availability_zone %>"
+    preferred_maintenance_window        = "<%= cluster.preferred_maintenance_window %>"
+    cluster_parameter_group_name        = "<%= cluster.cluster_parameter_groups[0].parameter_group_name %>"
+    automated_snapshot_retention_period = "<%= cluster.automated_snapshot_retention_period %>"
+    port                                = "<%= cluster.endpoint.port %>"
+    cluster_version                     = "<%= cluster.cluster_version %>"
+    allow_version_upgrade               = "<%= cluster.allow_version_upgrade %>"
+    number_of_nodes                     = "<%= cluster.number_of_nodes %>"
+    publicly_accessible                 = "<%= cluster.publicly_accessible %>"
+    encrypted                           = "<%= cluster.encrypted %>"
+    skip_final_snapshot                 = "true"
+}
+<% end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 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.5"
+  spec.add_dependency "aws-sdk", "~> 2.2.7"
   spec.add_dependency "oj"
   spec.add_dependency "ox"
   spec.add_dependency "thor"
@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "rake", "~> 10.0"
   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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-02-16 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.5
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
@@ -203,9 +217,11 @@ files:
 - lib/terraforming/resource/iam_role_policy.rb
 - lib/terraforming/resource/iam_user.rb
 - lib/terraforming/resource/iam_user_policy.rb
+- lib/terraforming/resource/internet_gateway.rb
 - lib/terraforming/resource/network_acl.rb
 - lib/terraforming/resource/network_interface.rb
 - lib/terraforming/resource/rds.rb
+- lib/terraforming/resource/redshift.rb
 - lib/terraforming/resource/route53_record.rb
 - lib/terraforming/resource/route53_zone.rb
 - lib/terraforming/resource/route_table.rb
@@ -232,9 +248,11 @@ files:
 - lib/terraforming/template/tf/iam_role_policy.erb
 - 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/network_acl.erb
 - lib/terraforming/template/tf/network_interface.erb
 - lib/terraforming/template/tf/rds.erb
+- lib/terraforming/template/tf/redshift.erb
 - lib/terraforming/template/tf/route53_record.erb
 - lib/terraforming/template/tf/route53_zone.erb
 - lib/terraforming/template/tf/route_table.erb
@@ -268,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)