terraforming 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579938c93e511511d9d81db6dc0832eee5300fea
-  data.tar.gz: 91c1d9a93cf0e2381cab45436c33d5ea4113708f
+  metadata.gz: a06eef6162629702c7d05c7c0db5925f7935888b
+  data.tar.gz: 258afec05eb52e63b257660bfc4db4197240c0df
 SHA512:
-  metadata.gz: e7ea11e17c9334bb607ae216ccc5429b9a7ee54b24d2f3322e5204f5a7b751af26ac9018edcfe174bc581b679fa6c860eb8d2ccf41eebfd3e48ca22fbbd9ea7b
-  data.tar.gz: c3f17f500258953ad9f5150b806ca0f5ecafee13edc25dcd7e96074e1334f32fed8045fe514205178b791f1bbf8362d94d8a2fda5550bf620b82e54b8442ebe1
+  metadata.gz: 0d5cd22e89677dd168ebeb2883d47f9bdf98b47c76e0a42ea3b0e913c01d65df6bcf2ddf616b3e998312fd7c3b924b28d1281d1284d68f558fa7db50a579d9ff
+  data.tar.gz: db7af6de24c20eb6a78e2495fae54856955938960015d9f640e6d3c999ff669accbc1c09457e109a68bab8271300d773a02f92ff169f7894b38da2de70637818

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [v0.3.0](https://github.com/dtan4/terraforming/releases/tag/v0.3.0) (2015-08-23)
+
+## Resource
+
+- AWS Network Interface #127 (thanks @sakazuki)
+- AWS Elastic IP #124 (thanks @sakazuki)
+
+## Fixed
+
+- Normalize module name of IAM user #129
+
 # [v0.2.0](https://github.com/dtan4/terraforming/releases/tag/v0.2.0) (2015-08-22)
 
 ## New feature
@@ -11,10 +22,6 @@
 - 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/lib/terraforming/cli.rb

@@ -34,6 +34,11 @@ module Terraforming
       execute(Terraforming::Resource::ElastiCacheSubnetGroup, options)
     end
 
+    desc "eip", "EIP"
+    def eip
+      execute(Terraforming::Resource::EIP, options)
+    end
+
     desc "elb", "ELB"
     def elb
       execute(Terraforming::Resource::ELB, options)
@@ -89,6 +94,11 @@ module Terraforming
       execute(Terraforming::Resource::NetworkACL, options)
     end
 
+    desc "nif", "Network Interface"
+    def nif
+      execute(Terraforming::Resource::NetworkInterface, options)
+    end
+
     desc "r53r", "Route53 Record"
     def r53r
       execute(Terraforming::Resource::Route53Record, options)

data/lib/terraforming/resource/eip.rb

@@ -0,0 +1,58 @@
+module Terraforming
+  module Resource
+    class EIP
+      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/eip")
+      end
+
+      def tfstate
+        eips.inject({}) do |resources, addr|
+          attributes = {
+            "association_id" => addr.association_id,
+            "domain" => addr.domain,
+            "id" => addr.allocation_id,
+            "instance" => addr.instance_id,
+            "network_interface" => addr.network_interface_id,
+            "private_ip" => addr.private_ip_address,
+            "public_ip" => addr.public_ip,
+            "vpc" => is_vpc?(addr).to_s,
+          }
+          attributes.delete_if{|k, v| v.nil?}
+          resources["aws_eip.#{addr.allocation_id}"] = {
+            "type" => "aws_eip",
+            "primary" => {
+              "id" => addr.allocation_id,
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def eips
+        @client.describe_addresses.addresses
+      end
+
+      def is_vpc?(addr)
+        addr.domain.eql?("vpc")
+      end
+    end
+  end
+end

data/lib/terraforming/resource/iam_user.rb

@@ -28,7 +28,7 @@ module Terraforming
             "path" => user.path,
             "unique_id" => user.user_id,
           }
-          resources["aws_iam_user.#{user.user_name}"] = {
+          resources["aws_iam_user.#{module_name_of(user)}"] = {
             "type" => "aws_iam_user",
             "primary" => {
               "id" => user.user_name,
@@ -45,6 +45,10 @@ module Terraforming
       def iam_users
         @client.list_users.users
       end
+
+      def module_name_of(user)
+        normalize_module_name(user.user_name)
+      end
     end
   end
 end

data/lib/terraforming/resource/network_interface.rb

@@ -0,0 +1,69 @@
+module Terraforming
+  module Resource
+    class NetworkInterface
+      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/network_interface")
+      end
+
+      def tfstate
+        network_interfaces.inject({}) do |resources, network_interface|
+          attributes = {
+            "attachment.#" => attachment_of(network_interface) ? "1" : "0",
+            "id" => network_interface.network_interface_id,
+            "private_ips.#" => private_ips_of(network_interface).length.to_s,
+            "security_groups.#" => security_groups_of(network_interface).length.to_s,
+            "source_dest_check" => network_interface.source_dest_check.to_s,
+            "subnet_id" => network_interface.subnet_id,
+            "tags.#" => network_interface.tag_set.length.to_s,
+          }
+          resources["aws_network_interface.#{module_name_of(network_interface)}"] = {
+            "type" => "aws_network_interface",
+            "primary" => {
+              "id" => network_interface.network_interface_id,
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def attachment_of(network_interface)
+        network_interface.attachment
+      end
+
+      def private_ips_of(network_interface)
+        network_interface.private_ip_addresses.map{|addr| addr.private_ip_address }
+      end
+
+      def security_groups_of(network_interface)
+        network_interface.groups.map { |group| group.group_id }
+      end
+
+      def module_name_of(network_interface)
+        network_interface.network_interface_id
+      end
+
+      def network_interfaces
+        @client.describe_network_interfaces.network_interfaces
+      end
+
+    end
+  end
+end

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

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

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

@@ -1,5 +1,5 @@
 <% iam_users.each do |user| -%>
-resource "aws_iam_user" "<%= user.user_name %>" {
+resource "aws_iam_user" "<%= module_name_of(user) %>" {
     name = "<%= user.user_name %>"
     path = "<%= user.path %>"
 }

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

@@ -0,0 +1,22 @@
+<% network_interfaces.each do |network_interface| -%>
+resource "aws_network_interface" "<%= module_name_of(network_interface) %>" {
+    subnet_id         = "<%= network_interface.subnet_id %>"
+    private_ips       = <%= private_ips_of(network_interface).inspect %>
+    security_groups   = <%= security_groups_of(network_interface).inspect %>
+    source_dest_check = <%= network_interface.source_dest_check %>
+<% if network_interface.attachment && network_interface.attachment.instance_id -%>
+    attachment {
+        instance     = "<%= network_interface.attachment.instance_id %>"
+        device_index = <%= network_interface.attachment.device_index %>
+    }
+<% end -%>
+<% if network_interface.tag_set.length > 0 -%>
+    tags {
+<% network_interface.tag_set.each do |tag| -%>
+        "<%= tag.key %>" = "<%= tag.value %>"
+<% end -%>
+    }
+<% end -%>
+}
+
+<% end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/terraforming.rb

@@ -15,6 +15,7 @@ require "terraforming/resource/db_parameter_group"
 require "terraforming/resource/db_security_group"
 require "terraforming/resource/db_subnet_group"
 require "terraforming/resource/ec2"
+require "terraforming/resource/eip"
 require "terraforming/resource/elasti_cache_cluster"
 require "terraforming/resource/elasti_cache_subnet_group"
 require "terraforming/resource/elb"
@@ -28,6 +29,7 @@ require "terraforming/resource/iam_role_policy"
 require "terraforming/resource/iam_user"
 require "terraforming/resource/iam_user_policy"
 require "terraforming/resource/network_acl"
+require "terraforming/resource/network_interface"
 require "terraforming/resource/rds"
 require "terraforming/resource/route53_record"
 require "terraforming/resource/route53_zone"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -189,6 +189,7 @@ files:
 - lib/terraforming/resource/db_security_group.rb
 - lib/terraforming/resource/db_subnet_group.rb
 - lib/terraforming/resource/ec2.rb
+- lib/terraforming/resource/eip.rb
 - lib/terraforming/resource/elasti_cache_cluster.rb
 - lib/terraforming/resource/elasti_cache_subnet_group.rb
 - lib/terraforming/resource/elb.rb
@@ -202,6 +203,7 @@ files:
 - lib/terraforming/resource/iam_user.rb
 - lib/terraforming/resource/iam_user_policy.rb
 - lib/terraforming/resource/network_acl.rb
+- lib/terraforming/resource/network_interface.rb
 - lib/terraforming/resource/rds.rb
 - lib/terraforming/resource/route53_record.rb
 - lib/terraforming/resource/route53_zone.rb
@@ -213,6 +215,7 @@ files:
 - lib/terraforming/template/tf/db_security_group.erb
 - lib/terraforming/template/tf/db_subnet_group.erb
 - lib/terraforming/template/tf/ec2.erb
+- lib/terraforming/template/tf/eip.erb
 - lib/terraforming/template/tf/elasti_cache_cluster.erb
 - lib/terraforming/template/tf/elasti_cache_subnet_group.erb
 - lib/terraforming/template/tf/elb.erb
@@ -226,6 +229,7 @@ files:
 - lib/terraforming/template/tf/iam_user.erb
 - lib/terraforming/template/tf/iam_user_policy.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/route53_record.erb
 - lib/terraforming/template/tf/route53_zone.erb
@@ -258,9 +262,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)
 test_files: []
-has_rdoc: