terraforming 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb884d952f74d4079fcfb52bc4798a8a90d98587
-  data.tar.gz: 23fe2b8eeb2eea9843ecaf1dee41c5a387ea2a57
+  metadata.gz: 0207edd5bbc29b4447cf4a914e4a015baff47d71
+  data.tar.gz: dfccf028d7c75bf7a9985c918381e35844def811
 SHA512:
-  metadata.gz: 72708c53e470e3d7b7d673b51b22bcd81a83af77e18e5166008880c164e14da85c16646bb20b91a6922c51bb88b914b365e4b14785e45a9152cc580567e62444
-  data.tar.gz: 810a584ff6e7b4f5ba4e4a07a44ae4685b629eb4ec523bf8f7397bb362b7de9134ff9654a31105dc06cccf8993ed87d7a99b8ac8a1510793cc929795f0c2efc5
+  metadata.gz: 61254cf936a3ab76a5ea25b3c3ce53bc9384d6ba79322932fb6340d06884ad9c2824f9d654ed4370b72da7c0f4131d6c5aa97baf7a390a748c8dbc72285906c0
+  data.tar.gz: 59059b7a2d224657436234c2ac2c77e685346e288f81bb2427e11b071f353f2c1e828dbb20f350fbecb602631061e7efdfc63c6287287405147022956a813435

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [v0.12.0](https://github.com/dtan4/terraforming/releases/tag/v0.11.0) (2016-12-20)
+
+## Resource
+
+- AWS ALB [#291](https://github.com/dtan4/terraforming/pull/291)
+- AWS EFS File System [#283](https://github.com/dtan4/terraforming/pull/283) (thanks @notjames)
+
+## Fixed / Updated
+
+- Fix associate_public_ip_address attr for EC2 [#287](https://github.com/dtan4/terraforming/pull/287) (thanks @diwaniuk)
+
 # [v0.11.0](https://github.com/dtan4/terraforming/releases/tag/v0.11.0) (2016-11-14)
 
 ## Resource

data/README.md

@@ -76,6 +76,7 @@ PS C:\> terraforming ec2 --use-bundled-cert
 ```bash
 $ terraforming
 Commands:
+  terraforming alb             # ALB
   terraforming asg             # AutoScaling Group
   terraforming cwa             # CloudWatch Alarm
   terraforming dbpg            # Database Parameter Group
@@ -84,6 +85,7 @@ Commands:
   terraforming ec2             # EC2
   terraforming ecc             # ElastiCache Cluster
   terraforming ecsn            # ElastiCache Subnet Group
+  terraforming efs             # EFS File System
   terraforming eip             # EIP
   terraforming elb             # ELB
   terraforming help [COMMAND]  # Describe available commands or one specific command

data/lib/terraforming.rb

@@ -8,6 +8,7 @@ require "terraforming/util"
 require "terraforming/version"
 
 require "terraforming/cli"
+require "terraforming/resource/alb"
 require "terraforming/resource/auto_scaling_group"
 require "terraforming/resource/cloud_watch_alarm"
 require "terraforming/resource/db_parameter_group"
@@ -17,6 +18,7 @@ require "terraforming/resource/ec2"
 require "terraforming/resource/eip"
 require "terraforming/resource/elasti_cache_cluster"
 require "terraforming/resource/elasti_cache_subnet_group"
+require "terraforming/resource/efs_file_system"
 require "terraforming/resource/elb"
 require "terraforming/resource/iam_group"
 require "terraforming/resource/iam_group_membership"

data/lib/terraforming/cli.rb

@@ -9,6 +9,11 @@ module Terraforming
                  type: :boolean,
                  desc: "Use the bundled CA certificate from AWS SDK"
 
+    desc "alb", "ALB"
+    def alb
+      execute(Terraforming::Resource::ALB, options)
+    end
+
     desc "asg", "AutoScaling Group"
     def asg
       execute(Terraforming::Resource::AutoScalingGroup, options)
@@ -54,6 +59,11 @@ module Terraforming
       execute(Terraforming::Resource::EIP, options)
     end
 
+    desc "efs", "EFS File System"
+    def efs
+      execute(Terraforming::Resource::EFSFileSystem, options)
+    end
+
     desc "elb", "ELB"
     def elb
       execute(Terraforming::Resource::ELB, options)

data/lib/terraforming/resource/alb.rb

@@ -0,0 +1,98 @@
+module Terraforming
+  module Resource
+    class ALB
+      include Terraforming::Util
+
+      def self.tf(client: Aws::ElasticLoadBalancingV2::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::ElasticLoadBalancingV2::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/alb")
+      end
+
+      def tfstate
+        load_balancers.inject({}) do |resources, load_balancer|
+          load_balancer_attributes = load_balancer_attributes_of(load_balancer)
+          attributes = {
+            "dns_name" => load_balancer.dns_name,
+            "enable_deletion_protection" => load_balancer_attributes["deletion_protection.enabled"].to_s,
+            "id" => load_balancer.load_balancer_arn,
+            "idle_timeout" => load_balancer_attributes["idle_timeout.timeout_seconds"].to_s,
+            "internal" => internal?(load_balancer).to_s,
+            "name" => load_balancer.load_balancer_name,
+            "security_groups.#" => load_balancer.security_groups.length.to_s,
+            "subnets.#" => load_balancer.availability_zones.length.to_s,
+            "zone_id" => load_balancer.canonical_hosted_zone_id,
+          }
+
+          attributes.merge!(access_logs_attributes_of(load_balancer_attributes))
+          attributes.merge!(tag_attributes_of(load_balancer))
+
+          resources["aws_alb.#{module_name_of(load_balancer)}"] = {
+            "type" => "aws_alb",
+            "primary" => {
+              "id" => load_balancer.load_balancer_arn,
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def access_logs_attributes_of(load_balancer_attributes)
+        {
+          "access_logs.#" => "1",
+          "access_logs.0.bucket" => load_balancer_attributes["access_logs.s3.bucket"],
+          "access_logs.0.enabled" => load_balancer_attributes["access_logs.s3.enabled"].to_s,
+          "access_logs.0.prefix" => load_balancer_attributes["access_logs.s3.prefix"],
+        }
+      end
+
+      def internal?(load_balancer)
+        load_balancer.scheme == "internal"
+      end
+
+      def load_balancers
+        @client.describe_load_balancers.load_balancers
+      end
+
+      def load_balancer_attributes_of(load_balancer)
+        @client.describe_load_balancer_attributes(load_balancer_arn: load_balancer.load_balancer_arn).attributes.inject({}) do |result, attribute|
+          result[attribute.key] = attribute.value
+          result
+        end
+      end
+
+      def module_name_of(load_balancer)
+        normalize_module_name(load_balancer.load_balancer_name)
+      end
+
+      def tag_attributes_of(load_balancer)
+        tags = tags_of(load_balancer)
+        attributes = { "tags.%" => tags.length.to_s }
+
+        tags.each do |tag|
+          attributes["tags.#{tag.key}"] = tag.value
+        end
+
+        attributes
+      end
+
+      def tags_of(load_balancer)
+        @client.describe_tags(resource_arns: [load_balancer.load_balancer_arn]).tag_descriptions.first.tags
+      end
+    end
+  end
+end

data/lib/terraforming/resource/ec2.rb

@@ -26,7 +26,7 @@ module Terraforming
 
           attributes = {
             "ami" => instance.image_id,
-            "associate_public_ip_address" => "true",
+            "associate_public_ip_address" => associate_public_ip?(instance).to_s,
             "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,
@@ -96,6 +96,10 @@ module Terraforming
           (instance.subnet_id && instance.subnet_id != "" && instance.security_groups.empty?)
       end
 
+      def associate_public_ip?(instance)
+        !instance.public_ip_address.to_s.empty?
+      end
+
       def monitoring_state(instance)
         %w(enabled pending).include?(instance.monitoring.state)
       end

data/lib/terraforming/resource/efs_file_system.rb

@@ -0,0 +1,56 @@
+module Terraforming
+  module Resource
+    class EFSFileSystem
+      include Terraforming::Util
+
+      def self.tf(client: Aws::EFS::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::EFS::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/elastic_filesystem")
+      end
+
+      def tfstate
+        file_systems.inject({}) do |resources, efs|
+          attributes = {
+            "creation_token" => efs.creation_token,
+            "id" => efs.file_system_id,
+            "performance_mode" => efs.performance_mode,
+            "tags.%" => "1",
+            "tags.Name" => efs.name,
+          }
+
+          resources["aws_efs_file_system.#{efs.file_system_id}"] = {
+            "type" => "aws_efs_file_system",
+            "depends_on" => [],
+            "primary" => {
+              "id" => efs.file_system_id,
+              "attributes" => attributes,
+              "meta" => {},
+              "tainted" => false,
+            },
+            "deposed" => [],
+            "provider" => "aws",
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def file_systems
+        @client.describe_file_systems.data.file_systems.flatten
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+<% load_balancers.each do |load_balancer| -%>
+  <%- load_balancer_attributes = load_balancer_attributes_of(load_balancer) -%>
+  <%- tags = tags_of(load_balancer) -%>
+resource "aws_alb" "<%= module_name_of(load_balancer) %>" {
+    idle_timeout    = <%= load_balancer_attributes["idle_timeout.timeout_seconds"] %>
+    internal        = <%= internal?(load_balancer).to_s %>
+    name            = "<%= load_balancer.load_balancer_name %>"
+    security_groups = <%= load_balancer.security_groups.inspect %>
+    subnets         = <%= load_balancer.availability_zones.map { |az| az.subnet_id }.inspect %>
+
+    enable_deletion_protection = <%= load_balancer_attributes["deletion_protection.enabled"].to_s %>
+
+<%- if load_balancer_attributes["access_logs.s3.enabled"] == "true" -%>
+    access_logs {
+        bucket  = "<%= load_balancer_attributes["access_logs.s3.bucket"] %>"
+        enabled = <%= load_balancer_attributes["access_logs.s3.enabled"] %>
+        prefix  = "<%= load_balancer_attributes["access_logs.s3.prefix"] %>"
+    }
+
+<%- end -%>
+    tags {
+<% tags.each do |tag| -%>
+        "<%= tag.key %>" = "<%= tag.value %>"
+<% end -%>
+    }
+}
+
+<% end -%>

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

@@ -15,7 +15,7 @@ resource "aws_instance" "<%= module_name_of(instance) %>" {
 <%- else -%>
     security_groups             = <%= instance.security_groups.map { |sg| sg.group_name }.inspect %>
 <%- end -%>
-    associate_public_ip_address = true
+    associate_public_ip_address = <%= associate_public_ip?(instance) %>
     private_ip                  = "<%= instance.private_ip_address %>"
 <%- if instance.source_dest_check -%>
     source_dest_check           = <%= instance.source_dest_check %>

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

@@ -0,0 +1,18 @@
+<% file_systems.each_with_index do |efs, idx| -%>
+resource "aws_efs_file_system" "<%= efs.file_system_id %>" {
+<% if efs.creation_token -%>
+    creation_token = "<%= efs.creation_token %>"
+<% end -%>
+<% if efs.file_system_id -%>
+    file_system_id = "<%= efs.file_system_id %>"
+<% end -%>
+<% if efs.performance_mode -%>
+    performance_mode = "<%= efs.performance_mode %>"
+<% end -%>
+<% if efs.name -%>
+    tags {
+        Name = "<%= efs.name %>"
+    }
+<% end -%>
+}
+<% end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -146,12 +146,14 @@ files:
 - contrib/zsh-completion/_terraforming
 - lib/terraforming.rb
 - lib/terraforming/cli.rb
+- lib/terraforming/resource/alb.rb
 - lib/terraforming/resource/auto_scaling_group.rb
 - lib/terraforming/resource/cloud_watch_alarm.rb
 - lib/terraforming/resource/db_parameter_group.rb
 - lib/terraforming/resource/db_security_group.rb
 - lib/terraforming/resource/db_subnet_group.rb
 - lib/terraforming/resource/ec2.rb
+- lib/terraforming/resource/efs_file_system.rb
 - lib/terraforming/resource/eip.rb
 - lib/terraforming/resource/elasti_cache_cluster.rb
 - lib/terraforming/resource/elasti_cache_subnet_group.rb
@@ -183,6 +185,7 @@ files:
 - lib/terraforming/resource/subnet.rb
 - lib/terraforming/resource/vpc.rb
 - lib/terraforming/resource/vpn_gateway.rb
+- lib/terraforming/template/tf/alb.erb
 - lib/terraforming/template/tf/auto_scaling_group.erb
 - lib/terraforming/template/tf/cloud_watch_alarm.erb
 - lib/terraforming/template/tf/db_parameter_group.erb
@@ -192,6 +195,7 @@ files:
 - 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/elastic_filesystem.erb
 - lib/terraforming/template/tf/elb.erb
 - lib/terraforming/template/tf/iam_group.erb
 - lib/terraforming/template/tf/iam_group_membership.erb
@@ -245,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)