terraforming 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7a02d6cfb8ee138645ef72e09e2f1f785ad482a
-  data.tar.gz: 75571c29e0dc1c7335df48c2842daf40d0487d04
+  metadata.gz: bc34e08ee4b6f0d0723edb9f2fc4be372b3892c2
+  data.tar.gz: c1d7da734fed9e4502ece8d0914b6283c2acc93a
 SHA512:
-  metadata.gz: bae5fcdafee7f5616d4f1efa412b3b814aca328734a82852e256ddd8bf0f689328ade7701395ab31202c17258048448c4004a78cb6ed575ab1020101ce374ab5
-  data.tar.gz: 6d61f42f177ece0a6a6d0553d4c7e400cb8e212a17bbc0c6363af623d531e91a7e9b7419bcac7fd621295488346bd3ab9f6e02de045c043f031880920b66af1a
+  metadata.gz: e4f61751c5ff99acda6d6b64cc7f56103b37e02aa59f0d26af7a6d36a628d78fe911b9b8e1a32f5e73ec9a7d32f46cfd846e5f9a3bdfb05867ac27aa2334220f
+  data.tar.gz: b8183e1c9dd3b21454f3fd5a1d422c4985db24a57d25f71409e0a8761ba80921bcf0538daace8a8d4bd8402b16a8e887ac403f0a1cc47d2da674c433bd0a9d68

data/CHANGELOG.md

@@ -1,4 +1,19 @@
-# v0.1.0 (UNRELEASED)
+# [v0.1.0](https://github.com/dtan4/terraforming/releases/tag/v0.1.0) (2015-06-20)
+
+### New feature
+
+- `--merge TFSTATE_PATH` option: Merge generated tfstate to specified `terraform.tfstate`
+
+### Fixed
+
+- ELB must include either AZs or Subnets
+- Include AWS Network ACL subnet ids
+
+### Resource
+
+- AWS IAM instance profile
+- AWS IAM role
+- AWS IAM role policy
 
 # [v0.0.5](https://github.com/dtan4/terraforming/releases/tag/v0.0.5) (2015-06-01)
 

data/README.md

@@ -3,6 +3,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)
+[![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)
 [![Docker Repository on Quay.io](https://quay.io/repository/dtan4/terraforming/status "Docker Repository on Quay.io")](https://quay.io/repository/dtan4/terraforming)
@@ -45,11 +46,20 @@ Commands:
   terraforming dbsn            # Database Subnet Group
   terraforming ec2             # EC2
   terraforming elb             # ELB
-  terraforming help [COMMAND]  # Describe available commands or one specific command
+  terraforming iamg            # IAM Group
+  terraforming iamgp           # IAM Group Policy
+  terraforming iamip           # IAM Instance Profile
+  terraforming iamp            # IAM Policy
+  terraforming iamr            # IAM Role
+  terraforming iamrp           # IAM Role Policy
+  terraforming iamu            # IAM User
+  terraforming iamup           # IAM User Policy
   terraforming nacl            # Network ACL
+  terraforming r53r            # Route53 Record
+  terraforming r53z            # Route53 Hosted Zone
   terraforming rds             # RDS
   terraforming s3              # S3
-  terraforming sg              # SecurityGroup
+  terraforming sg              # Security Group
   terraforming sn              # Subnet
   terraforming vpc             # VPC
 ```

data/lib/terraforming.rb

@@ -5,6 +5,7 @@ require "aws-sdk-core"
 require "erb"
 require "json"
 require "thor"
+require "zlib"
 
 require "terraforming/util"
 require "terraforming/version"
@@ -17,7 +18,10 @@ require "terraforming/resource/ec2"
 require "terraforming/resource/elb"
 require "terraforming/resource/iam_group"
 require "terraforming/resource/iam_group_policy"
+require "terraforming/resource/iam_instance_profile"
 require "terraforming/resource/iam_policy"
+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/network_acl"

data/lib/terraforming/cli.rb

@@ -1,109 +1,109 @@
 module Terraforming
   class CLI < Thor
+    class_option :merge, type: :string, desc: "tfstate file to merge"
+    class_option :tfstate, type: :boolean, desc: "Generate tfstate"
+
     desc "dbpg", "Database Parameter Group"
-    option :tfstate, type: :boolean
     def dbpg
       execute(Terraforming::Resource::DBParameterGroup, options)
     end
 
     desc "dbsg", "Database Security Group"
-    option :tfstate, type: :boolean
     def dbsg
       execute(Terraforming::Resource::DBSecurityGroup, options)
     end
 
     desc "dbsn", "Database Subnet Group"
-    option :tfstate, type: :boolean
     def dbsn
       execute(Terraforming::Resource::DBSubnetGroup, options)
     end
 
     desc "ec2", "EC2"
-    option :tfstate, type: :boolean
     def ec2
       execute(Terraforming::Resource::EC2, options)
     end
 
     desc "elb", "ELB"
-    option :tfstate, type: :boolean
     def elb
       execute(Terraforming::Resource::ELB, options)
     end
 
     desc "iamg", "IAM Group"
-    option :tfstate, type: :boolean
     def iamg
       execute(Terraforming::Resource::IAMGroup, options)
     end
 
     desc "iamgp", "IAM Group Policy"
-    option :tfstate, type: :boolean
     def iamgp
       execute(Terraforming::Resource::IAMGroupPolicy, options)
     end
 
+    desc "iamip", "IAM Instance Profile"
+    def iamip
+      execute(Terraforming::Resource::IAMInstanceProfile, options)
+    end
+
     desc "iamp", "IAM Policy"
-    option :tfstate, type: :boolean
     def iamp
       execute(Terraforming::Resource::IAMPolicy, options)
     end
 
+    desc "iamr", "IAM Role"
+    def iamr
+      execute(Terraforming::Resource::IAMRole, options)
+    end
+
+    desc "iamrp", "IAM Role Policy"
+    def iamrp
+      execute(Terraforming::Resource::IAMRolePolicy, options)
+    end
+
     desc "iamu", "IAM User"
-    option :tfstate, type: :boolean
     def iamu
       execute(Terraforming::Resource::IAMUser, options)
     end
 
     desc "iamup", "IAM User Policy"
-    option :tfstate, type: :boolean
     def iamup
       execute(Terraforming::Resource::IAMUserPolicy, options)
     end
 
     desc "nacl", "Network ACL"
-    option :tfstate, type: :boolean
     def nacl
       execute(Terraforming::Resource::NetworkACL, options)
     end
 
     desc "r53r", "Route53 Record"
-    option :tfstate, type: :boolean
     def r53r
       execute(Terraforming::Resource::Route53Record, options)
     end
 
     desc "r53z", "Route53 Hosted Zone"
-    option :tfstate, type: :boolean
     def r53z
       execute(Terraforming::Resource::Route53Zone, options)
     end
 
     desc "rds", "RDS"
-    option :tfstate, type: :boolean
     def rds
       execute(Terraforming::Resource::RDS, options)
     end
 
     desc "s3", "S3"
-    option :tfstate, type: :boolean
     def s3
       execute(Terraforming::Resource::S3, options)
     end
 
-    desc "sg", "SecurityGroup"
-    option :tfstate, type: :boolean
+    desc "sg", "Security Group"
     def sg
       execute(Terraforming::Resource::SecurityGroup, options)
     end
 
     desc "sn", "Subnet"
-    option :tfstate, type: :boolean
     def sn
       execute(Terraforming::Resource::Subnet, options)
     end
 
     desc "vpc", "VPC"
-    option :tfstate, type: :boolean
     def vpc
       execute(Terraforming::Resource::VPC, options)
     end
@@ -111,7 +111,20 @@ module Terraforming
     private
 
     def execute(klass, options)
-      puts options[:tfstate] ? klass.tfstate : klass.tf
+      result = if options[:tfstate]
+                 tfstate(klass, options[:merge])
+               else
+                 klass.tf
+               end
+
+      puts result
+    end
+
+    def tfstate(klass, tfstate_path)
+      return klass.tfstate unless tfstate_path
+
+      base_tfstate = JSON.parse(open(tfstate_path).read)
+      klass.tfstate(tfstate_base: base_tfstate)
     end
   end
 end

data/lib/terraforming/resource/db_parameter_group.rb

@@ -3,12 +3,12 @@ module Terraforming
     class DBParameterGroup
       include Terraforming::Util
 
-      def self.tf(client = Aws::RDS::Client.new)
+      def self.tf(client: Aws::RDS::Client.new)
         self.new(client).tf
       end
 
-      def self.tfstate(client = Aws::RDS::Client.new)
-        self.new(client).tfstate
+      def self.tfstate(client: Aws::RDS::Client.new, tfstate_base: nil)
+        self.new(client).tfstate(tfstate_base)
       end
 
       def initialize(client)
@@ -19,7 +19,7 @@ module Terraforming
         apply_template(@client, "tf/db_parameter_group")
       end
 
-      def tfstate
+      def tfstate(tfstate_base)
         resources = db_parameter_groups.inject({}) do |result, parameter_group|
           attributes = {
             "description" => parameter_group.description,
@@ -39,7 +39,7 @@ module Terraforming
           result
         end
 
-        generate_tfstate(resources)
+        generate_tfstate(resources, tfstate_base)
       end
 
       private

data/lib/terraforming/resource/db_security_group.rb

@@ -3,12 +3,12 @@ module Terraforming
     class DBSecurityGroup
       include Terraforming::Util
 
-      def self.tf(client = Aws::RDS::Client.new)
+      def self.tf(client: Aws::RDS::Client.new)
         self.new(client).tf
       end
 
-      def self.tfstate(client = Aws::RDS::Client.new)
-        self.new(client).tfstate
+      def self.tfstate(client: Aws::RDS::Client.new, tfstate_base: nil)
+        self.new(client).tfstate(tfstate_base)
       end
 
       def initialize(client)
@@ -19,7 +19,7 @@ module Terraforming
         apply_template(@client, "tf/db_security_group")
       end
 
-      def tfstate
+      def tfstate(tfstate_base)
         resources = db_security_groups.inject({}) do |result, security_group|
           attributes = {
             "db_subnet_group_name" => security_group.db_security_group_name,
@@ -38,7 +38,7 @@ module Terraforming
           result
         end
 
-        generate_tfstate(resources)
+        generate_tfstate(resources, tfstate_base)
       end
 
       private

data/lib/terraforming/resource/db_subnet_group.rb

@@ -3,12 +3,12 @@ module Terraforming
     class DBSubnetGroup
       include Terraforming::Util
 
-      def self.tf(client = Aws::RDS::Client.new)
+      def self.tf(client: Aws::RDS::Client.new)
         self.new(client).tf
       end
 
-      def self.tfstate(client = Aws::RDS::Client.new)
-        self.new(client).tfstate
+      def self.tfstate(client: Aws::RDS::Client.new, tfstate_base: nil)
+        self.new(client).tfstate(tfstate_base)
       end
 
       def initialize(client)
@@ -19,7 +19,7 @@ module Terraforming
         apply_template(@client, "tf/db_subnet_group")
       end
 
-      def tfstate
+      def tfstate(tfstate_base)
         resources = db_subnet_groups.inject({}) do |result, subnet_group|
           attributes = {
             "description" => subnet_group.db_subnet_group_description,
@@ -37,7 +37,7 @@ module Terraforming
           result
         end
 
-        generate_tfstate(resources)
+        generate_tfstate(resources, tfstate_base)
       end
 
       private

data/lib/terraforming/resource/ec2.rb

@@ -3,12 +3,12 @@ module Terraforming
     class EC2
       include Terraforming::Util
 
-      def self.tf(client = Aws::EC2::Client.new)
+      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
+      def self.tfstate(client: Aws::EC2::Client.new, tfstate_base: nil)
+        self.new(client).tfstate(tfstate_base)
       end
 
       def initialize(client)
@@ -19,7 +19,7 @@ module Terraforming
         apply_template(@client, "tf/ec2")
       end
 
-      def tfstate
+      def tfstate(tfstate_base)
         resources = instances.inject({}) do |result, instance|
           attributes = {
             "ami"=> instance.image_id,
@@ -54,7 +54,7 @@ module Terraforming
           result
         end
 
-        generate_tfstate(resources)
+        generate_tfstate(resources, tfstate_base)
       end
 
       private

data/lib/terraforming/resource/elb.rb

@@ -3,12 +3,12 @@ module Terraforming
     class ELB
       include Terraforming::Util
 
-      def self.tf(client = Aws::ElasticLoadBalancing::Client.new)
+      def self.tf(client: Aws::ElasticLoadBalancing::Client.new)
         self.new(client).tf
       end
 
-      def self.tfstate(client = Aws::ElasticLoadBalancing::Client.new)
-        self.new(client).tfstate
+      def self.tfstate(client: Aws::ElasticLoadBalancing::Client.new, tfstate_base: nil)
+        self.new(client).tfstate(tfstate_base)
       end
 
       def initialize(client)
@@ -19,7 +19,7 @@ module Terraforming
         apply_template(@client, "tf/elb")
       end
 
-      def tfstate
+      def tfstate(tfstate_base)
         resources = load_balancers.inject({}) do |result, load_balancer|
           load_balancer_attributes = load_balancer_attributes_of(load_balancer)
           attributes = {
@@ -49,7 +49,7 @@ module Terraforming
           result
         end
 
-        generate_tfstate(resources)
+        generate_tfstate(resources, tfstate_base)
       end
 
       def load_balancers
@@ -63,6 +63,10 @@ module Terraforming
       def module_name_of(load_balancer)
         normalize_module_name(load_balancer.load_balancer_name)
       end
+
+      def vpc_elb?(load_balancer)
+        load_balancer.vpc_id != ""
+      end
     end
   end
 end

data/lib/terraforming/resource/iam_group.rb

@@ -3,12 +3,12 @@ module Terraforming
     class IAMGroup
       include Terraforming::Util
 
-      def self.tf(client = Aws::IAM::Client.new)
+      def self.tf(client: Aws::IAM::Client.new)
         self.new(client).tf
       end
 
-      def self.tfstate(client = Aws::IAM::Client.new)
-        self.new(client).tfstate
+      def self.tfstate(client: Aws::IAM::Client.new, tfstate_base: nil)
+        self.new(client).tfstate(tfstate_base)
       end
 
       def initialize(client)
@@ -19,7 +19,7 @@ module Terraforming
         apply_template(@client, "tf/iam_group")
       end
 
-      def tfstate
+      def tfstate(tfstate_base)
         resources = iam_groups.inject({}) do |result, group|
           attributes = {
             "arn"=> group.arn,
@@ -39,7 +39,7 @@ module Terraforming
           result
         end
 
-        generate_tfstate(resources)
+        generate_tfstate(resources, tfstate_base)
       end
 
       private