terraforming 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab51ccecba0ce3d3701be95d8718f6d5fe6a796
-  data.tar.gz: 0032ebcb37559bd617d042347b12c8764c2a82f3
+  metadata.gz: cb884d952f74d4079fcfb52bc4798a8a90d98587
+  data.tar.gz: 23fe2b8eeb2eea9843ecaf1dee41c5a387ea2a57
 SHA512:
-  metadata.gz: de61ed94cc3077c1866602f6cf41f4298b02c0ce91105b8cae4d8c8054b45182feeb2318f531d574006d6fcb19c8302c26e7d2bb27c6257136ce90b3f038ff7a
-  data.tar.gz: a1a27835df34c2e8c2830cab7c578381c75fec982a55f4859f427d6af2ffb7e3a921120333897621b3e604622f5bf6154f4496d44e7950481a0e0b4a963d5f70
+  metadata.gz: 72708c53e470e3d7b7d673b51b22bcd81a83af77e18e5166008880c164e14da85c16646bb20b91a6922c51bb88b914b365e4b14785e45a9152cc580567e62444
+  data.tar.gz: 810a584ff6e7b4f5ba4e4a07a44ae4685b629eb4ec523bf8f7397bb362b7de9134ff9654a31105dc06cccf8993ed87d7a99b8ac8a1510793cc929795f0c2efc5

data/.travis.yml

@@ -4,7 +4,13 @@ rvm:
 - 2.2.5
 - 2.1.10
 env:
-- secure: n0mxwnyjuXI4mJO4mp++2TnsPJ+XgCF/J1U2L5piE5j3xMhSU+5V0JrA1uFlS0Pemb44M7BjgmF9S4G35BwyAQpctpCYhqy9tFa6+Y6nxEv5hCv2cZz7BSAZM6eb+zq20409hxTHRaQOr1DBeE4R5S2PrmOXRqvYfTRv3LNSLFk=
+  global:
+    - secure: n0mxwnyjuXI4mJO4mp++2TnsPJ+XgCF/J1U2L5piE5j3xMhSU+5V0JrA1uFlS0Pemb44M7BjgmF9S4G35BwyAQpctpCYhqy9tFa6+Y6nxEv5hCv2cZz7BSAZM6eb+zq20409hxTHRaQOr1DBeE4R5S2PrmOXRqvYfTRv3LNSLFk=
+  matrix:
+    - OJ=0
+    - OJ=1
+before_script:
+  - if [[ $OJ -eq 1 ]]; then gem install oj; fi
 notifications:
   slack:
     secure: iTI8zpxXQJqf5e9ix4buLRsGlf9lJRZqA9Fawdqm41msBrC0Zsp31XzBS7ZPiTcdHhImtOC4lccTCW2C8kR6waaG5VOF0U2BwyKaNFKsXMaVk6yrNhYkvJ9YVicuU9hL+JKLyBrSDYQ7+vXcHqaz4H4dYpPThrv6sfq4jBOp+eM=

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [v0.11.0](https://github.com/dtan4/terraforming/releases/tag/v0.11.0) (2016-11-14)
+
+## Resource
+
+- AWS CloudWatch alarm [#273](https://github.com/dtan4/terraforming/pull/273) (thanks @eredi93)
+
+## Fixed / Updated
+
+- Remove native extension gems and use wrapper gem [#275](https://github.com/dtan4/terraforming/pull/275)
+- Generate `iops` field only with io1 volume [#271](https://github.com/dtan4/terraforming/pull/271)
+- Set `force_destroy: false` for IAM users [#267](https://github.com/dtan4/terraforming/pull/267) (thanks @raylu)
+- Remove commands to delete empty files in export in README.md [#261](https://github.com/dtan4/terraforming/pull/261) (thanks @benmanns)
+
 # [v0.10.0](https://github.com/dtan4/terraforming/releases/tag/v0.10.0) (2016-08-24)
 
 ## Resource

data/CONTRIBUTING.md

@@ -0,0 +1,24 @@
+# Contributing
+
+I love pull requests from everyone! By the way, I have a favor to ask you with your contribution :bow:
+
+## Making changes
+
+- Currently, this gem supports only __AWS__ resources. Other providers are supported as separated gems.
+  - Datadog: [terraforming-datadog](https://github.com/dtan4/terraforming-datadog)
+  - DNSimple: [terraforming-dnsimple](https://github.com/dtan4/terraforming-dnsimple)
+- Do not bump gem version in your pull request.
+- Please follow the coding style of _existing_ code. Most of trivial rules can be checked by [RuboCop](https://github.com/bbatsov/rubocop) ([`rubocop.yml`](https://github.com/dtan4/terraforming/blob/master/.rubocop.yml)).
+  - Coding style is checked automatically by [SideCI](https://sideci.com) right after creating pull request. If there is error, SideCI comments at the point error occured.
+- Please write tests for your changes. All tests are written with [RSpec](http://rspec.info/).
+
+## Adding new resource
+
+- Class name must match to Terraforming's resource name without `aws_` prefix, and be a complete resource name.
+  - e.g. `aws_iam_group_membership`: `IAMGroupMembership`
+  - Yes, I know that some of resources I added a long ago don't follow to this rule...
+- File name must also match to Terraforming's resource name without `aws_` prefix.
+  - e.g. `aws_iam_group_membership`: `iam_group_membership.rb`
+- Command name should be abbreviation.
+  - e.g. `aws_iam_group_membership`: `iamgp`
+- Please check generation result by executing `terraform plan` with real resources. There should be NO diff with generated `.tf` and `.tfstate`.

data/README.md

@@ -77,6 +77,7 @@ PS C:\> terraforming ec2 --use-bundled-cert
 $ terraforming
 Commands:
   terraforming asg             # AutoScaling Group
+  terraforming cwa             # CloudWatch Alarm
   terraforming dbpg            # Database Parameter Group
   terraforming dbsg            # Database Security Group
   terraforming dbsn            # Database Subnet Group
@@ -337,8 +338,8 @@ Example assuming you want to export everything from us-west-2 and you are using
 ```bash
 export AWS_REGION=us-west-2
 terraforming help | grep terraforming | grep -v help | awk '{print "terraforming", $2, "--profile", "default", ">", $2".tf";}' | bash
-# remove files that only have 1 empty line (nothing in AWS)
-find . -type f | xargs wc -l | grep '1 .' | awk '{print $2;}' | xargs rm
+# find files that only have 1 empty line (likely nothing in AWS)
+find . -type f -name '*.tf' | xargs wc -l | grep ' 1 .'
 ```
 
 ## Run as Docker container [![Docker Repository on Quay.io](https://quay.io/repository/dtan4/terraforming/status "Docker Repository on Quay.io")](https://quay.io/repository/dtan4/terraforming)

data/lib/terraforming.rb

@@ -1,16 +1,6 @@
-require "oj"
-
-begin
-  require "ox"
-rescue NameError => e
-  spec = Gem::Specification.stubs.find { |s| s.name == 'ox' }
-  raise e unless spec
-  require File.join(spec.gem_dir, "lib/ox")
-end
-
 require "aws-sdk-core"
 require "erb"
-require "json"
+require "multi_json"
 require "thor"
 require "zlib"
 
@@ -19,6 +9,7 @@ require "terraforming/version"
 
 require "terraforming/cli"
 require "terraforming/resource/auto_scaling_group"
+require "terraforming/resource/cloud_watch_alarm"
 require "terraforming/resource/db_parameter_group"
 require "terraforming/resource/db_security_group"
 require "terraforming/resource/db_subnet_group"

data/lib/terraforming/cli.rb

@@ -14,6 +14,11 @@ module Terraforming
       execute(Terraforming::Resource::AutoScalingGroup, options)
     end
 
+    desc "cwa", "CloudWatch Alarm"
+    def cwa
+      execute(Terraforming::Resource::CloudWatchAlarm, options)
+    end
+
     desc "dbpg", "Database Parameter Group"
     def dbpg
       execute(Terraforming::Resource::DBParameterGroup, options)
@@ -216,10 +221,10 @@ module Terraforming
     end
 
     def tfstate(klass, tfstate_path)
-      tfstate = tfstate_path ? JSON.parse(open(tfstate_path).read) : tfstate_skeleton
+      tfstate = tfstate_path ? MultiJson.load(open(tfstate_path).read) : tfstate_skeleton
       tfstate["serial"] = tfstate["serial"] + 1
       tfstate["modules"][0]["resources"] = tfstate["modules"][0]["resources"].merge(klass.tfstate)
-      JSON.pretty_generate(tfstate)
+      MultiJson.encode(tfstate, pretty: true)
     end
 
     def tfstate_skeleton

data/lib/terraforming/resource/cloud_watch_alarm.rb

@@ -0,0 +1,87 @@
+module Terraforming
+  module Resource
+    class CloudWatchAlarm
+      include Terraforming::Util
+
+      def self.tf(client: Aws::CloudWatch::Client.new)
+        self.new(client).tf
+      end
+
+      def self.tfstate(client: Aws::CloudWatch::Client.new)
+        self.new(client).tfstate
+      end
+
+      def initialize(client)
+        @client = client
+      end
+
+      def tf
+        apply_template(@client, "tf/cloud_watch_alarm")
+      end
+
+      def tfstate
+        alarms.inject({}) do |resources, alarm|
+          resources["aws_cloudwatch_metric_alarm.#{module_name_of(alarm)}"] = {
+            "type" => "aws_cloudwatch_metric_alarm",
+            "primary" => {
+              "id" => alarm.alarm_name,
+              "attributes" => alarm_attributes(alarm)
+            }
+          }
+          resources
+        end
+      end
+
+      private
+
+      def alarm_attributes(alarm)
+        attributes = {
+          "actions_enabled" => alarm.actions_enabled.to_s,
+          "alarm_description" => sanitize(alarm.alarm_description),
+          "alarm_name" => alarm.alarm_name,
+          "comparison_operator" => alarm.comparison_operator,
+          "evaluation_periods" => alarm.evaluation_periods.to_s,
+          "id" => alarm.alarm_name,
+          "metric_name" => alarm.metric_name,
+          "namespace" => alarm.namespace,
+          "period" => alarm.period.to_s,
+          "statistic" => alarm.statistic,
+          "threshold" => alarm.threshold.to_s,
+          "unit" => sanitize(alarm.unit)
+        }
+        add_checksummed_attributes(attributes, alarm)
+      end
+
+      def alarms
+        @client.describe_alarms.map(&:metric_alarms).flatten
+      end
+
+      def module_name_of(alarm)
+        normalize_module_name(alarm.alarm_name)
+      end
+
+      def sanitize(argument)
+        argument.nil? ? "" : argument
+      end
+
+      def add_checksummed_attributes(attributes, alarm)
+        %w(insufficient_data_actions alarm_actions ok_actions dimensions).each do |action|
+          attribute = alarm.send(action.to_sym)
+          attributes["#{action}.#"] = attribute.size.to_s
+          attribute.each do |attr|
+            if attr.is_a? String
+              checksum = Zlib.crc32(attr)
+              value = attr
+            else
+              checksum = attr.name
+              value = attr.value
+            end
+            attributes["#{action}.#{checksum}"] = value
+          end
+        end
+
+        attributes
+      end
+    end
+  end
+end

data/lib/terraforming/resource/iam_user.rb

@@ -27,12 +27,13 @@ module Terraforming
             "name" => user.user_name,
             "path" => user.path,
             "unique_id" => user.user_id,
+            "force_destroy" => "false",
           }
           resources["aws_iam_user.#{module_name_of(user)}"] = {
             "type" => "aws_iam_user",
             "primary" => {
               "id" => user.user_name,
-              "attributes" => attributes
+              "attributes" => attributes,
             }
           }
 

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

@@ -0,0 +1,33 @@
+<% alarms.each do |alarm| -%>
+resource "aws_cloudwatch_metric_alarm" "<%= normalize_module_name(alarm.alarm_name) %>" {
+    alarm_name          = "<%= alarm.alarm_name %>"
+    comparison_operator = "<%= alarm.comparison_operator %>"
+    evaluation_periods  = "<%= alarm.evaluation_periods %>"
+    metric_name         = "<%= alarm.metric_name %>"
+    namespace           = "<%= alarm.namespace %>"
+    period              = "<%= alarm.period %>"
+    statistic           = "<%= alarm.statistic %>"
+    threshold           = "<%= alarm.threshold %>"
+    alarm_description   = "<%= alarm.alarm_description %>"
+<%- unless alarm.ok_actions.empty? -%>
+    ok_actions          = <%= alarm.ok_actions %>
+<%- end -%>
+<%- unless alarm.alarm_actions.empty? -%>
+    alarm_actions       = <%= alarm.alarm_actions %>
+<%- end -%>
+<%- unless alarm.actions_enabled -%>
+    actions_enabled     = <%= alarm.actions_enabled %>
+<%- end -%>
+<%- unless alarm.dimensions.empty? -%>
+    dimensions {
+<% alarm.dimensions.each do |dimension| -%>
+        <%= dimension.name %> = "<%= dimension.value %>"
+<% end -%>
+    }
+<%- end -%>
+<%- unless alarm.insufficient_data_actions.empty? -%>
+    insufficient_data_actions = <%= alarm.insufficient_data_actions %>
+<%- end -%>
+}
+
+<%- end -%>

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

@@ -27,10 +27,10 @@ resource "aws_instance" "<%= module_name_of(instance) %>" {
     root_block_device {
         volume_type           = "<%= block_device.volume_type %>"
         volume_size           = <%= block_device.size %>
-<%- if block_device.iops -%>
+        delete_on_termination = <%= mapping.ebs.delete_on_termination %>
+<%- if block_device.volume_type == "io1" && block_device.iops -%>
         iops                  = <%= block_device.iops %>
 <%- end -%>
-        delete_on_termination = <%= mapping.ebs.delete_on_termination %>
     }
 <%- else -%>
     ebs_block_device {
@@ -38,10 +38,10 @@ resource "aws_instance" "<%= module_name_of(instance) %>" {
         snapshot_id           = "<%= block_device.snapshot_id %>"
         volume_type           = "<%= block_device.volume_type %>"
         volume_size           = <%= block_device.size %>
-<%- if block_device.iops -%>
+        delete_on_termination = <%= mapping.ebs.delete_on_termination %>
+<%- if block_device.volume_type == "io1" && block_device.iops -%>
         iops                  = <%= block_device.iops %>
 <%- end -%>
-        delete_on_termination = <%= mapping.ebs.delete_on_termination %>
     }
 <% end -%>
 

data/lib/terraforming/version.rb

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

data/terraforming.gemspec

@@ -19,14 +19,13 @@ 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.5.1"
-  spec.add_dependency "oj", "~> 2.17.1"
-  spec.add_dependency "ox", "~> 2.4.0"
+  spec.add_dependency "aws-sdk", "~> 2.6.1"
+  spec.add_dependency "multi_json", "~> 1.12.1"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "coveralls", "~> 0.8.13"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "simplecov", "~> 0.11.1"
+  spec.add_development_dependency "simplecov", "~> 0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.1
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.1
-- !ruby/object:Gem::Dependency
-  name: ox
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
 description: Export existing AWS resources to Terraform style (tf, tfstate)
 email:
 - dtanshi45@gmail.com
@@ -150,6 +136,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -160,6 +147,7 @@ files:
 - lib/terraforming.rb
 - lib/terraforming/cli.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
@@ -196,6 +184,7 @@ files:
 - lib/terraforming/resource/vpc.rb
 - lib/terraforming/resource/vpn_gateway.rb
 - lib/terraforming/template/tf/auto_scaling_group.erb
+- lib/terraforming/template/tf/cloud_watch_alarm.erb
 - lib/terraforming/template/tf/db_parameter_group.erb
 - lib/terraforming/template/tf/db_security_group.erb
 - lib/terraforming/template/tf/db_subnet_group.erb