terraforming 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e84d837a0dba1a8c3f14a86c4c7f93598e024a5
-  data.tar.gz: c7ef19c07166185719c56eababac3eb68c96e5d2
+  metadata.gz: 9e8974debd8988dc251d0ea827a67fdc5042583c
+  data.tar.gz: abc7cebb5bd5859305c02e57900d7a3b9ea038b7
 SHA512:
-  metadata.gz: 7dc8ddfd1720d5b92ae44c2360b5421db204f7da909567b72dbead96588640c61bf5e5c880217119430655ec82dd05ef0ac0505d9bc7c2fefc23c4ce57b82eaf
-  data.tar.gz: b656c4214cb331e3cafcb59a97741c94df06be17f8a3cdf76e58975e55e0c814c0e4e88e2b801ec74125a8e671538d1e25f2c237d000bc9ec1a1899c67d59896
+  metadata.gz: 9b4bbbe089a66b450b79b3bb54f473b2ac1118a60d88314ffb9d804f481ecbcd6adc4f2444656d0dd7d8372b04e7d0a6cf67b8ae5789cb4a38fe7ce2e37f9de6
+  data.tar.gz: 9d287e2b5fc87b76c0e44d61211efa34ffe544b9f144e965e55fbd871592ed2cb3b33c5979e46a0c556af446cf0f63c6a7e0a2171d0ec9c75429e823a1f1a683

data/.travis.yml

@@ -9,6 +9,9 @@ env:
   matrix:
     - OJ=0
     - OJ=1
+branches:
+  only:
+    - master
 before_install:
   - gem update --system
   - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [v0.16.0](https://github.com/dtan4/terraforming/releases/tag/v0.16.0) (2017-10-23)
+
+- Declare supported Terraform version: v0.9.3 or higher
+
+## New feature
+
+- Support assuming role `--assume` [#379](https://github.com/dtan4/terraforming/pull/379) (thanks @cmedley)
+
+## Fixed / Updated
+
+- Use ENCRYPT_DECRYPT as KMS key usage [#380](https://github.com/dtan4/terraforming/pull/380)
+- Fix IAM instance profile [#376](https://github.com/dtan4/terraforming/pull/376) (thanks @chroju)
+
 # [v0.15.0](https://github.com/dtan4/terraforming/releases/tag/v0.15.0) (2017-09-18)
 
 ## Fixed / Updated

data/CONTRIBUTING.md

@@ -2,6 +2,15 @@
 
 I love pull requests from everyone! By the way, I have a favor to ask you with your contribution :bow:
 
+## Reporting issue
+
+- Please write your ...
+  - platform (macOS, Linux, Windows, ...)
+  - Ruby version
+  - Terraforming version
+  - Terraform version (if `terraform plan` failed)
+  - executed command and error message (if any)
+
 ## Making changes
 
 - Currently, this gem supports only __AWS__ resources. Other providers are supported as separated gems.

data/README.md

@@ -25,7 +25,9 @@ Export existing AWS resources to [Terraform](https://terraform.io/) style (tf, t
 
 ## Supported version
 
-Ruby 2.1 or higher
+- Ruby 2.1 or higher is required
+- Terraform v0.9.3 or higher is recommended
+  - Some resources (e.g. `iam_instance_profile`) uses newer resource specification
 
 ## Installation
 
@@ -65,6 +67,12 @@ aws_secret_access_key = FugaFuga
 $ terraforming s3 --profile hoge
 ```
 
+You can assume a role by using the `--assume` option.
+
+```bash
+$ terraforming s3 --assume arn:aws:iam::123456789123:role/test-role
+```
+
 You can force the AWS SDK to utilize the CA certificate that is bundled with the SDK for systems where the default OpenSSL certificate is not installed (e.g. Windows) by utilizing the `--use-bundled-cert` option.
 
 ```bash

data/lib/terraforming/cli.rb

@@ -5,6 +5,7 @@ module Terraforming
     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"
+    class_option :assume, type: :string, desc: "Role ARN to assume"
     class_option :use_bundled_cert,
                  type: :boolean,
                  desc: "Use the bundled CA certificate from AWS SDK"
@@ -229,6 +230,13 @@ module Terraforming
     def configure_aws(options)
       Aws.config[:credentials] = Aws::SharedCredentials.new(profile_name: options[:profile]) if options[:profile]
       Aws.config[:region] = options[:region] if options[:region]
+
+      if options[:assume]
+        args = { role_arn: options[:assume], role_session_name: "terraforming-session-#{Time.now.to_i}" }
+        args[:client] = Aws::STS::Client.new(profile: options[:profile]) if options[:profile]
+        Aws.config[:credentials] = Aws::AssumeRoleCredentials.new(args)
+      end
+
       Aws.use_bundled_cert! if options[:use_bundled_cert]
     end
 

data/lib/terraforming/resource/iam_instance_profile.rb

@@ -26,6 +26,7 @@ module Terraforming
             "id" => profile.instance_profile_name,
             "name" => profile.instance_profile_name,
             "path" => profile.path,
+            "role" => profile.roles[0].role_name,
             "roles.#" => profile.roles.length.to_s,
           }
           resources["aws_iam_instance_profile.#{module_name_of(profile)}"] = {

data/lib/terraforming/resource/kms_key.rb

@@ -32,7 +32,7 @@ module Terraforming
                 "id" => key.key_id,
                 "is_enabled" => key.enabled.to_s,
                 "key_id" => key.key_id,
-                "key_usage" => key_usage_of(key),
+                "key_usage" => key.key_usage,
                 "policy" => key_policy_of(key),
               },
             },
@@ -69,10 +69,6 @@ module Terraforming
         @client.get_key_rotation_status(key_id: key.key_id)
       end
 
-      def key_usage_of(key)
-        key.key_usage.tr("_", "/")
-      end
-
       def managed_master_key?(key)
         !aliases.select { |a| a.target_key_id == key.key_id && a.alias_name =~ %r{\Aalias/aws/} }.empty?
       end

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

@@ -1,8 +1,8 @@
 <% iam_instance_profiles.each do |profile| -%>
 resource "aws_iam_instance_profile" "<%= module_name_of(profile) %>" {
-    name  = "<%= profile.instance_profile_name %>"
-    path  = "<%= profile.path %>"
-    roles = <%= profile.roles.map { |role| role.role_name }.inspect %>
+    name = "<%= profile.instance_profile_name %>"
+    path = "<%= profile.path %>"
+    role = "<%= profile.roles[0].role_name %>"
 }
 
 <% end -%>

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

@@ -1,7 +1,7 @@
 <% keys.each do |key| -%>
 resource "aws_kms_key" "<%= module_name_of(key) %>" {
     description             = "<%= key.description %>"
-    key_usage               = "<%= key_usage_of(key) %>"
+    key_usage               = "<%= key.key_usage %>"
     is_enabled              = <%= key.enabled %>
     enable_key_rotation     = <%= key_rotation_status_of(key).key_rotation_enabled %>
 

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -457,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)