terraforming 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce28792dd6bf8346c71c97b88490a492f26f5b1c
-  data.tar.gz: 5fbb2eb91615d03bc50566b28877334a8b64d36f
+  metadata.gz: 9c5cba83f78c4e252cd0fe5bea73a238a9e8f651
+  data.tar.gz: a2c3b770b7986822234f8f91914b1acb92097565
 SHA512:
-  metadata.gz: f22672a8e344a840ca1a89d34757328fae4eec18b18050dd277625aa3659ac05001dacaffa406ab63d145a7be854ee82819836f1088baccc05574334ae367610
-  data.tar.gz: bd9b3a407399e1d3e9d4a52611c042f445973b7feb304ccbea032d9871fc618a4f039424d976a9949f45bbf087777fa6986260af3c4b13ff9085b7a989aba66a
+  metadata.gz: 844e51ae9255465e773915b266f281adb71920e9a18de7d6788aeebf51d7d1609f9fd96bf2fcaa47f5f38924da28f49d35ab37e3c5a6cf4c17b940a6a73d4698
+  data.tar.gz: b7eb1e7832659e0f3476d00a5b90673c782101880beb0abc617991865f5f0e18e7ba948b3e00c7a7ba45f447e5edc4b0d27f09abb2d99c11135cde5305a018bb

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
 - 2.4.1
 - 2.3.4
 - 2.2.7
-- 2.1.10
 env:
   global:
     - secure: n0mxwnyjuXI4mJO4mp++2TnsPJ+XgCF/J1U2L5piE5j3xMhSU+5V0JrA1uFlS0Pemb44M7BjgmF9S4G35BwyAQpctpCYhqy9tFa6+Y6nxEv5hCv2cZz7BSAZM6eb+zq20409hxTHRaQOr1DBeE4R5S2PrmOXRqvYfTRv3LNSLFk=

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v0.14.0](https://github.com/dtan4/terraforming/releases/tag/v0.14.0) (2017-08-05)
+
+## Fixed / Updated
+
+- Drop Ruby 2.1 from CI [#351](https://github.com/dtan4/terraforming/pull/351)
+- Add `icmp_code` and `icmp_type` to NACL [#350](https://github.com/dtan4/terraforming/pull/350)
+- Use aws-sdk [#349](https://github.com/dtan4/terraforming/pull/349)
+- Rename title of aws_route53_record with wildcard [#348](https://github.com/dtan4/terraforming/pull/348) (thanks @furhouse)
+- SNS Support [#332](https://github.com/dtan4/terraforming/pull/332) (thanks @uberblah)
+  - `terraforming snst` (SNS Topic), `terraforming snss` (SNS Subscription)
+- Fix typo in cli.rb [#329](https://github.com/dtan4/terraforming/pull/329) (thanks @slalFe)
+
 # [v0.13.2](https://github.com/dtan4/terraforming/releases/tag/v0.13.2) (2017-04-20)
 
 ## Fixed / Updated

data/README.md

@@ -115,6 +115,8 @@ Commands:
   terraforming s3              # S3
   terraforming sg              # Security Group
   terraforming sn              # Subnet
+  terraforming snst            # SNS Topic
+  terraforming snss            # SNS Subscription
   terraforming sqs             # SQS
   terraforming vgw             # VPN Gateway
   terraforming vpc             # VPC

data/lib/terraforming.rb

@@ -49,3 +49,5 @@ require "terraforming/resource/subnet"
 require "terraforming/resource/sqs"
 require "terraforming/resource/vpc"
 require "terraforming/resource/vpn_gateway"
+require "terraforming/resource/sns_topic"
+require "terraforming/resource/sns_topic_subscription"

data/lib/terraforming/cli.rb

@@ -1,7 +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 :overwrite, type: :boolean, desc: "Overwrite existing tfstate"
     class_option :tfstate, type: :boolean, desc: "Generate tfstate"
     class_option :profile, type: :string, desc: "AWS credentials profile"
     class_option :region, type: :string, desc: "AWS region"
@@ -214,6 +214,16 @@ module Terraforming
       execute(Terraforming::Resource::VPNGateway, options)
     end
 
+    desc "snst", "SNS Topic"
+    def snst
+      execute(Terraforming::Resource::SNSTopic, options)
+    end
+
+    desc "snss", "SNS Subscription"
+    def snss
+      execute(Terraforming::Resource::SNSTopicSubscription, options)
+    end
+
     private
 
     def configure_aws(options)

data/lib/terraforming/resource/route53_record.rb

@@ -95,7 +95,7 @@ module Terraforming
       end
 
       def module_name_of(record, counter)
-        normalize_module_name(name_of(record.name) + "-" + record.type + (!counter.nil? ? "-" + counter.to_s : ""))
+        normalize_module_name(name_of(record.name.gsub(/\\052/, 'wildcard')) + "-" + record.type + (!counter.nil? ? "-" + counter.to_s : ""))
       end
 
       def zone_id_of(hosted_zone)

data/lib/terraforming/resource/sns_topic.rb

@@ -0,0 +1,75 @@
+module Terraforming
+  module Resource
+    class SNSTopic
+      include Terraforming::Util
+
+      def self.tf(client: Aws::SNS::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::SNS::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/sns_topic")
+      end
+
+      def tfstate
+        topics.inject({}) do |resources, topic|
+          attributes = {
+            "name"            => module_name_of(topic),
+            "id"              => topic["TopicArn"],
+            "arn"             => topic["TopicArn"],
+            "display_name"    => topic["DisplayName"],
+            "policy"          => topic.key?("Policy") ? topic["Policy"] : "",
+            "delivery_policy" => topic.key?("DeliveryPolicy") ? topic["DeliveryPolicy"] : ""
+          }
+          resources["aws_sns_topic.#{module_name_of(topic)}"] = {
+            "type" => "aws_sns_topic",
+            "primary" => {
+              "id"         => topic["TopicArn"],
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def topics
+        topic_arns.map do |topic_arn|
+          attributes = @client.get_topic_attributes({
+            topic_arn: topic_arn,
+          }).attributes
+          attributes["TopicArn"] = topic_arn
+          attributes
+        end
+      end
+
+      def topic_arns
+        token = ""
+        arns = []
+
+        loop do
+          resp = @client.list_topics(next_token: token)
+          arns += resp.topics.map(&:topic_arn).flatten
+          token = resp.next_token
+          break if token.nil?
+        end
+
+        arns
+      end
+
+      def module_name_of(topic)
+        normalize_module_name(topic["TopicArn"].split(":").last)
+      end
+    end
+  end
+end

data/lib/terraforming/resource/sns_topic_subscription.rb

@@ -0,0 +1,83 @@
+module Terraforming
+  module Resource
+    class SNSTopicSubscription
+      include Terraforming::Util
+
+      def self.tf(client: Aws::SNS::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::SNS::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/sns_topic_subscription")
+      end
+
+      def tfstate
+        subscriptions.reject { |x| x["Protocol"].include?("email") }
+                     .inject({}) do |resources, subscription|
+          attributes = {
+            "id"                              => subscription["SubscriptionArn"],
+            "topic_arn"                       => subscription["TopicArn"],
+            "protocol"                        => subscription["Protocol"],
+            "endpoint"                        => subscription["Endpoint"],
+            "raw_message_delivery"            =>
+              subscription.key?("RawMessageDelivery") ? subscription["RawMessageDelivery"] : "false",
+            "confirmation_timeout_in_minutes" =>
+              subscription.key?("ConfirmationTimeoutInMinutes") ? subscription["ConfirmationTimeoutInMinutes"] : "1",
+            "endpoint_auto_confirms"          =>
+              subscription.key?("EndpointAutoConfirms") ? subscription["EndpointAutoConfirms"] : "false"
+          }
+          resources["aws_sns_topic_subscription.#{module_name_of(subscription)}"] = {
+            "type" => "aws_sns_topic_subscription",
+            "primary" => {
+              "id"         => subscription["SubscriptionArn"],
+              "attributes" => attributes
+            }
+          }
+
+          resources
+        end
+      end
+
+      private
+
+      def subscriptions
+        subscription_arns.map do |subscription_arn|
+          # check explicitly for an issue with some subscriptions that returns ARN=PendingConfirmation
+          next if subscription_arn == "PendingConfirmation"
+
+          attributes = @client.get_subscription_attributes({
+            subscription_arn: subscription_arn,
+          }).attributes
+          attributes["SubscriptionArn"] = subscription_arn
+          attributes
+        end.compact
+      end
+
+      def subscription_arns
+        token = ""
+        arns = []
+
+        loop do
+          resp = @client.list_subscriptions(next_token: token)
+          arns += resp.subscriptions.map(&:subscription_arn).flatten
+          token = resp.next_token
+          break if token.nil?
+        end
+
+        arns
+      end
+
+      def module_name_of(subscription)
+        normalize_module_name(subscription["SubscriptionArn"].split(":").last)
+      end
+    end
+  end
+end

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

@@ -11,6 +11,10 @@ resource "aws_network_acl" "<%= module_name_of(network_acl) %>" {
         action     = "<%= ingress.rule_action %>"
         protocol   = "<%= ingress.protocol %>"
         cidr_block = "<%= ingress.cidr_block %>"
+<%- if ingress.icmp_type_code -%>
+        icmp_code  = "<%= ingress.icmp_type_code.code %>"
+        icmp_type  = "<%= ingress.icmp_type_code.type %>"
+<%- end -%>
     }
 
 <% end -%>
@@ -22,6 +26,10 @@ resource "aws_network_acl" "<%= module_name_of(network_acl) %>" {
         action     = "<%= egress.rule_action %>"
         protocol   = "<%= egress.protocol %>"
         cidr_block = "<%= egress.cidr_block %>"
+<%- if egress.icmp_type_code -%>
+        icmp_code  = "<%= egress.icmp_type_code.code %>"
+        icmp_type  = "<%= egress.icmp_type_code.type %>"
+<%- end -%>
     }
 
 <% end -%>

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

@@ -0,0 +1,17 @@
+<% topics.each do |topic| -%>
+resource "aws_sns_topic" "<%= module_name_of(topic) %>" {
+  name            = "<%= module_name_of(topic) %>"
+  display_name    = "<%= topic["DisplayName"] %>"
+<% if topic.key? "Policy" -%>
+  policy          = <<POLICY
+<%= prettify_policy(topic["Policy"], unescape: true) %>
+POLICY
+<% end -%>
+<% if topic.key? "DeliveryPolicy" -%>
+  delivery_policy = <<POLICY
+<%= prettify_policy(topic["DeliveryPolicy"], unescape: true) %>
+POLICY
+<% end -%>
+}
+
+<% end -%>

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

@@ -0,0 +1,23 @@
+<% subscriptions.each do |subscription| -%>
+<% if subscription["Protocol"].include?("email") -%>
+/*
+<% end -%>
+resource "aws_sns_topic_subscription" "<%= module_name_of(subscription) %>" {
+  topic_arn                       = "<%= subscription["TopicArn"] %>"
+  protocol                        = "<%= subscription["Protocol"] %>"
+  endpoint                        = "<%= subscription["Endpoint"] %>"
+<% if subscription.key? "RawMessageDelivery" -%>
+  raw_message_delivery            = "<%= subscription["RawMessageDelivery"] %>"
+<% end -%>
+<% if subscription.key? "ConfirmationTimeoutInMinutes" %>
+  confirmation_timeout_in_minutes = "<%= subscription["ConfirmationTimeoutInMinutes"] %>"
+<% end -%>
+<% if subscription.key? "EndpointAutoConfirms" %>
+  endpoint_auto_confirms          = "<%= subscription["EndpointAutoConfirms"] %>"
+<% end -%>
+}
+<% if subscription["Protocol"].include?("email") -%>
+*/
+<% end -%>
+
+<% end -%>

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.13.2"
+  VERSION = "0.14.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.9.6"
+  spec.add_dependency "aws-sdk", "~> 2.10.17"
   spec.add_dependency "multi_json", "~> 1.12.1"
   spec.add_dependency "thor"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-08-05 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.9.6
+        version: 2.10.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.17
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,8 @@ files:
 - lib/terraforming/resource/route_table_association.rb
 - lib/terraforming/resource/s3.rb
 - lib/terraforming/resource/security_group.rb
+- lib/terraforming/resource/sns_topic.rb
+- lib/terraforming/resource/sns_topic_subscription.rb
 - lib/terraforming/resource/sqs.rb
 - lib/terraforming/resource/subnet.rb
 - lib/terraforming/resource/vpc.rb
@@ -224,6 +226,8 @@ files:
 - lib/terraforming/template/tf/route_table_association.erb
 - lib/terraforming/template/tf/s3.erb
 - lib/terraforming/template/tf/security_group.erb
+- lib/terraforming/template/tf/sns_topic.erb
+- lib/terraforming/template/tf/sns_topic_subscription.erb
 - lib/terraforming/template/tf/sqs.erb
 - lib/terraforming/template/tf/subnet.erb
 - lib/terraforming/template/tf/vpc.erb