terraforming 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e52682735bb8093a12c5832c544b2ea3cbdfb6d2
-  data.tar.gz: 65d93512fe17e8de0852daa46785c62da90d33ef
+  metadata.gz: 579938c93e511511d9d81db6dc0832eee5300fea
+  data.tar.gz: 91c1d9a93cf0e2381cab45436c33d5ea4113708f
 SHA512:
-  metadata.gz: 312acfb0db847730a56cb905cc3cd39ce5fdfdfb8a2969dbb92cf785489348c17f9560edd5328effd86b5a110b01b93cf1ed7281d426afc2ce06e23c8d8dc3a3
-  data.tar.gz: 60617ff9310066139c5fb2a36646b56956e49224126896bfbdac0f1ec895ceb96bc16bc27c24228a1f3b8b1704168c6c37d4b3f856f50c125b534659c5db5458
+  metadata.gz: e7ea11e17c9334bb607ae216ccc5429b9a7ee54b24d2f3322e5204f5a7b751af26ac9018edcfe174bc581b679fa6c860eb8d2ccf41eebfd3e48ca22fbbd9ea7b
+  data.tar.gz: c3f17f500258953ad9f5150b806ca0f5ecafee13edc25dcd7e96074e1334f32fed8045fe514205178b791f1bbf8362d94d8a2fda5550bf620b82e54b8442ebe1

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# [v0.2.0](https://github.com/dtan4/terraforming/releases/tag/v0.2.0) (2015-08-22)
+
+## New feature
+
+- Add `--overwrite` option to overwrite existing `terraform.tfstate` #117
+
+## Fixed
+
+- Export S3 buckets only in the same region #121
+- Exclude DB security group with empty ingress rules #120
+- Include associated VPC parameters in Route53 hosted zone #119
+- Support Route53 hosted zone with empty delegation set #118
+
+### Fixed
+
+- Stop including ElastiCache port at any time #112
+
 # [v0.1.6](https://github.com/dtan4/terraforming/releases/tag/v0.1.6) (2015-08-10)
 
 ### Fixed

data/README.md

@@ -84,6 +84,10 @@ Commands:
 
 ### Export tf
 
+```bash
+$ terraforming <resource>
+```
+
 (e.g. S3 buckets):
 
 ```bash
@@ -104,7 +108,11 @@ resource "aws_s3_bucket" "fuga" {
 
 ### Export tfstate
 
-Specify `--tfstate` option (e.g. S3 buckets):
+```bash
+$ terraforming <resource> --tfstate [--merge TFSTATE_PATH] [--overwrite]
+```
+
+(e.g. S3 buckets):
 
 ```bash
 $ terraforming s3 --tfstate
@@ -149,8 +157,7 @@ $ terraforming s3 --tfstate
 ```
 
 If you want to merge exported tfstate to existing `terraform.tfstate`, specify `--tfstate --merge=/path/to/terraform.tfstate` option.
-This option does NOT overwrite existing `terraform.tfstate`, but flush output to stdout like others.
-You should copy output in stdout by hand or `pbcopy` command, and paste it to existing `terraform.tfstate`.
+You can overwrite existing `terraform.tfstate` by specifying `--overwrite` option together.
 
 Existing `terraform.tfstate`:
 

data/lib/terraforming/cli.rb

@@ -1,6 +1,7 @@
 module Terraforming
   class CLI < Thor
     class_option :merge, type: :string, desc: "tfstate file to merge"
+    class_option :overwrite, type: :boolean, desc: "Overwrite existng tfstate"
     class_option :tfstate, type: :boolean, desc: "Generate tfstate"
 
     desc "dbpg", "Database Parameter Group"
@@ -127,7 +128,15 @@ module Terraforming
 
     def execute(klass, options)
       result = options[:tfstate] ? tfstate(klass, options[:merge]) : tf(klass)
-      puts result
+
+      if options[:tfstate] && options[:merge] && options[:overwrite]
+        open(options[:merge], "w+") do |f|
+          f.write(result)
+          f.flush
+        end
+      else
+        puts result
+      end
     end
 
     def tf(klass)

data/lib/terraforming/resource/db_security_group.rb

@@ -24,7 +24,7 @@ module Terraforming
           attributes = {
             "db_subnet_group_name" => security_group.db_security_group_name,
             "id" => security_group.db_security_group_name,
-            "ingress.#" => (security_group.ec2_security_groups.length + security_group.ip_ranges.length).to_s,
+            "ingress.#" => ingresses_of(security_group).length.to_s,
             "name" => security_group.db_security_group_name,
           }
           resources["aws_db_security_group.#{module_name_of(security_group)}"] = {
@@ -41,8 +41,12 @@ module Terraforming
 
       private
 
+      def ingresses_of(security_group)
+        security_group.ec2_security_groups + security_group.ip_ranges
+      end
+
       def db_security_groups
-        @client.describe_db_security_groups.db_security_groups
+        @client.describe_db_security_groups.db_security_groups.select { |sg| ingresses_of(sg).length > 0 }
       end
 
       def module_name_of(security_group)

data/lib/terraforming/resource/route53_zone.rb

@@ -22,12 +22,15 @@ module Terraforming
       def tfstate
         hosted_zones.inject({}) do |resources, hosted_zone|
           zone_id = zone_id_of(hosted_zone)
+          vpc = vpc_of(hosted_zone)
 
           attributes = {
             "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 : "",
+            "vpc_region" => vpc ? vpc.vpc_region : "",
             "zone_id" => zone_id,
           }
           resources["aws_route53_zone.#{module_name_of(hosted_zone)}"] = {
@@ -45,7 +48,7 @@ module Terraforming
       private
 
       def hosted_zones
-        @client.list_hosted_zones.hosted_zones
+        @client.list_hosted_zones.hosted_zones.map { |hosted_zone| @client.get_hosted_zone(id: hosted_zone.id) }
       end
 
       def tags_of(hosted_zone)
@@ -53,19 +56,28 @@ module Terraforming
       end
 
       def name_of(hosted_zone)
-        hosted_zone.name.gsub(/\.\z/, "")
+        hosted_zone.hosted_zone.name.gsub(/\.\z/, "")
       end
 
       def name_servers_of(hosted_zone)
-        @client.get_hosted_zone(id: hosted_zone.id).delegation_set.name_servers
+        delegation_set = hosted_zone.delegation_set
+        delegation_set ? delegation_set.name_servers : []
       end
 
       def module_name_of(hosted_zone)
-        normalize_module_name(name_of(hosted_zone))
+        normalize_module_name(name_of(hosted_zone)) << "-#{private_hosted_zone?(hosted_zone) ? 'private' : 'public'}"
+      end
+
+      def private_hosted_zone?(hosted_zone)
+        hosted_zone.hosted_zone.config.private_zone
+      end
+
+      def vpc_of(hosted_zone)
+        hosted_zone.vp_cs[0]
       end
 
       def zone_id_of(hosted_zone)
-        hosted_zone.id.gsub(/\A\/hostedzone\//, "")
+        hosted_zone.hosted_zone.id.gsub(/\A\/hostedzone\//, "")
       end
     end
   end

data/lib/terraforming/resource/s3.rb

@@ -42,6 +42,10 @@ module Terraforming
 
       private
 
+      def bucket_location_of(bucket)
+        @client.get_bucket_location(bucket: bucket.name).location_constraint
+      end
+
       def bucket_policy_of(bucket)
         @client.get_bucket_policy(bucket: bucket.name)
       rescue Aws::S3::Errors::NoSuchBucketPolicy
@@ -49,12 +53,17 @@ module Terraforming
       end
 
       def buckets
-        @client.list_buckets.buckets
+        @client.list_buckets.buckets.select { |bucket| same_region?(bucket) }
       end
 
       def module_name_of(bucket)
         normalize_module_name(bucket.name)
       end
+
+      def same_region?(bucket)
+        bucket_location = bucket_location_of(bucket)
+        (bucket_location == @client.config.region) || (bucket_location == "" && @client.config.region == "us-east-1")
+      end
     end
   end
 end

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

@@ -1,6 +1,11 @@
 <% hosted_zones.each do |hosted_zone| -%>
 resource "aws_route53_zone" "<%= module_name_of(hosted_zone) %>" {
-    name = "<%= name_of(hosted_zone) %>"
+    name       = "<%= name_of(hosted_zone) %>"
+<%- if private_hosted_zone?(hosted_zone) -%>
+  <%- vpc = vpc_of(hosted_zone) -%>
+    vpc_id     = "<%= vpc.vpc_id %>"
+    vpc_region = "<%= vpc.vpc_region %>"
+<%- end -%>
 
     tags {
 <% tags_of(hosted_zone).each do |tag| -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.1.6"
+  VERSION = "0.2.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.1.0"
+  spec.add_dependency "aws-sdk", "~> 2.1.15"
   spec.add_dependency "oj"
   spec.add_dependency "ox"
   spec.add_dependency "thor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.15
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -258,8 +258,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)
 test_files: []
+has_rdoc: