terraforming 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0d4e58b3e575b0651e800cad36a2fb8c58780cc
-  data.tar.gz: 12a4b4fb459f47b28089fcd063bad8b4e720b94f
+  metadata.gz: 456f41b8b7dace703db8fe006d3ba82789353a1a
+  data.tar.gz: deab4d92676649424ffbab582995085c098ac9de
 SHA512:
-  metadata.gz: 0a56a65bff72645122cfd3191dd5354fb9c133528e4d3c4374e84a356ab8621bb31ec5d64d1371d8fa4294484f719f8f3981e9b6825c6f074bd0be105a861270
-  data.tar.gz: 347f65090624c3eac681ed58a8e66dcd0c84a4d47606811e428261449dae95232037d48e2f19db3adba69ce6e0178978dce55ac17e404a53b9a53fd8470678c3
+  metadata.gz: 7d21bab80223eac19400fcca1c389a7b8cba2862a942afe4fe230c35e03c715c70be9733d8ab44bed849ab582c5df1bcbf5d617d95b31fe80b08539730ca85aa
+  data.tar.gz: 5d3347dcf189fb4468e147f722894ac664946fd915240a5f7af8e9b73675665889f0135f85e09293230633d954c23b7ce1223ff8da1b449cb77caa9fffef2b4b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v0.1.5](https://github.com/dtan4/terraforming/releases/tag/v0.1.5) (2015-08-10)
+
+### Updated
+
+- Support S3 bucket policy #110
+
 # [v0.1.4](https://github.com/dtan4/terraforming/releases/tag/v0.1.4) (2015-08-07)
 
 ### Fixed

data/lib/terraforming/resource/iam_group_policy.rb

@@ -25,7 +25,7 @@ module Terraforming
             "group" => policy.group_name,
             "id" => iam_group_policy_id_of(policy),
             "name" => policy.policy_name,
-            "policy" => prettify_policy(policy.policy_document, true)
+            "policy" => prettify_policy(policy.policy_document, breakline: true, unescape: true)
           }
           resources["aws_iam_group_policy.#{policy.policy_name}"] = {
             "type" => "aws_iam_group_policy",

data/lib/terraforming/resource/iam_policy.rb

@@ -26,7 +26,7 @@ module Terraforming
             "id" => policy.arn,
             "name" => policy.policy_name,
             "path" => policy.path,
-            "policy" => prettify_policy(version.document, true),
+            "policy" => prettify_policy(version.document, breakline: true, unescape: true),
           }
           resources["aws_iam_policy.#{policy.policy_name}"] = {
             "type" => "aws_iam_policy",

data/lib/terraforming/resource/iam_role.rb

@@ -23,7 +23,8 @@ module Terraforming
         iam_roles.inject({}) do |resources, role|
           attributes = {
             "arn" => role.arn,
-            "assume_role_policy" => prettify_policy(role.assume_role_policy_document, true),
+            "assume_role_policy" =>
+              prettify_policy(role.assume_role_policy_document, breakline: true, unescape: true),
             "id" => role.role_name,
             "name" => role.role_name,
             "path" => role.path,

data/lib/terraforming/resource/iam_role_policy.rb

@@ -24,7 +24,7 @@ module Terraforming
           attributes = {
             "id" => iam_role_policy_id_of(policy),
             "name" => policy.policy_name,
-            "policy" => prettify_policy(policy.policy_document, true),
+            "policy" => prettify_policy(policy.policy_document, breakline: true, unescape: true),
             "role" => policy.role_name,
           }
           resources["aws_iam_role_policy.#{policy.policy_name}"] = {

data/lib/terraforming/resource/iam_user_policy.rb

@@ -24,7 +24,7 @@ module Terraforming
           attributes = {
             "id" => iam_user_policy_id_of(policy),
             "name" => policy.policy_name,
-            "policy" => prettify_policy(policy.policy_document, true),
+            "policy" => prettify_policy(policy.policy_document, breakline: true, unescape: true),
             "user" => policy.user_name,
           }
           resources["aws_iam_user_policy.#{policy.policy_name}"] = {

data/lib/terraforming/resource/s3.rb

@@ -21,6 +21,7 @@ module Terraforming
 
       def tfstate
         buckets.inject({}) do |resources, bucket|
+          bucket_policy = bucket_policy_of(bucket)
           resources["aws_s3_bucket.#{module_name_of(bucket)}"] = {
             "type" => "aws_s3_bucket",
             "primary" => {
@@ -28,7 +29,9 @@ module Terraforming
               "attributes" => {
                 "acl" => "private",
                 "bucket" => bucket.name,
-                "id" => bucket.name
+                "force_destroy" => "false",
+                "id" => bucket.name,
+                "policy" => bucket_policy ? bucket_policy.policy.read : "",
               }
             }
           }
@@ -39,6 +42,12 @@ module Terraforming
 
       private
 
+      def bucket_policy_of(bucket)
+        @client.get_bucket_policy(bucket: bucket.name)
+      rescue Aws::S3::Errors::NoSuchBucketPolicy
+        nil
+      end
+
       def buckets
         @client.list_buckets.buckets
       end

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

@@ -3,7 +3,7 @@ resource "aws_iam_group_policy" "<%= policy.policy_name %>" {
     name   = "<%= policy.policy_name %>"
     group  = "<%= policy.group_name %>"
     policy = <<POLICY
-<%= prettify_policy(policy.policy_document) %>
+<%= prettify_policy(policy.policy_document, unescape: true) %>
 POLICY
 }
 

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

@@ -4,7 +4,7 @@ resource "aws_iam_policy" "<%= policy.policy_name %>" {
     name   = "<%= policy.policy_name %>"
     path   = "<%= policy.path %>"
     policy = <<POLICY
-<%= prettify_policy(version.document) %>
+<%= prettify_policy(version.document, unescape: true) %>
 POLICY
 }
 

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

@@ -3,7 +3,7 @@ resource "aws_iam_role" "<%= role.role_name %>" {
     name               = "<%= role.role_name %>"
     path               = "<%= role.path %>"
     assume_role_policy = <<POLICY
-<%= prettify_policy(role.assume_role_policy_document) %>
+<%= prettify_policy(role.assume_role_policy_document, unescape: true) %>
 POLICY
 }
 

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

@@ -3,7 +3,7 @@ resource "aws_iam_role_policy" "<%= policy.policy_name %>" {
     name   = "<%= policy.policy_name %>"
     role   = "<%= policy.role_name %>"
     policy = <<POLICY
-<%= prettify_policy(policy.policy_document) %>
+<%= prettify_policy(policy.policy_document, unescape: true) %>
 POLICY
 }
 

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

@@ -3,7 +3,7 @@ resource "aws_iam_user_policy" "<%= policy.policy_name %>" {
     name   = "<%= policy.policy_name %>"
     user   = "<%= policy.user_name %>"
     policy = <<POLICY
-<%= prettify_policy(policy.policy_document) %>
+<%= prettify_policy(policy.policy_document, unescape: true) %>
 POLICY
 }
 

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

@@ -2,6 +2,11 @@
 resource "aws_s3_bucket" "<%= module_name_of(bucket) %>" {
     bucket = "<%= bucket.name %>"
     acl    = "private"
+<%- unless (policy = bucket_policy_of(bucket)).nil? -%>
+    policy = <<POLICY
+<%= prettify_policy(policy.policy.read) %>
+POLICY
+<%- end -%>
 }
 
 <% end -%>

data/lib/terraforming/util.rb

@@ -17,8 +17,8 @@ module Terraforming
       File.join(File.expand_path(File.dirname(__FILE__)), "template", template_name) << ".erb"
     end
 
-    def prettify_policy(policy_document, breakline = false)
-      json = JSON.pretty_generate(JSON.parse(CGI.unescape(policy_document)))
+    def prettify_policy(document, breakline: false, unescape: false)
+      json = JSON.pretty_generate(JSON.parse(unescape ? CGI.unescape(document) : document))
 
       if breakline
         json[-1] != "\n" ? json << "\n" : json

data/lib/terraforming/version.rb

@@ -1,3 +1,3 @@
 module Terraforming
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraforming
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Daisuke Fujita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -258,9 +258,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Export existing AWS resources to Terraform style (tf, tfstate)
 test_files: []
-has_rdoc: