kumogata-template 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 192abd8a01159a3a1373f2061dc56d8529b2f71b
-  data.tar.gz: c71a1eb3841a68a38c001f6355f72b2293e5f0ce
+  metadata.gz: 3b7c5c58bc386eb269e5d341c8ebf017a35acfb4
+  data.tar.gz: fe355680255862807a561345d95d579b5d59714d
 SHA512:
-  metadata.gz: 01c7bce4d0aaafbcacd82c837c284515839522062a96a30cffd3f61cdd1cb174f799330ed4ddfaf5fa31a0e3e382fc8b03be48bb7534ee02d9ad28c6368dbb86
-  data.tar.gz: b4bdd068aa9b8d3a8be2eca82dce10eeb6c00cc1192aea2807a82a865495cbeebee987db76620d0e89884295d9f8491645161df50c281391bc1ac418e544eee6
+  metadata.gz: f199fc4f72e2a341e97aa94eacc362143dc33f8a5a959c77c28881caddf909c380c2dfac5bdf4c4c76bcb2bc1f5ecae4dd3d5a4a941dce512e099c4a9ccc3a79
+  data.tar.gz: 38306ede34739c5a85b4a200fa123f408bc33683ebc2ac6a3baf2e077a82e12663c336147b79b58ae8dc8f1df103666330654692ac664ce24e5f362d64eb2f89

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.27)
+    kumogata-template (0.0.28)
       aws-sdk (~> 2.3)
       kumogata (= 0.5.12)
 
@@ -48,7 +48,7 @@ GEM
       term-ansicolor
       therubyracer (= 0.12.2)
       uuidtools
-    libv8 (3.16.14.19)
+    libv8 (3.16.14.19-x86_64-darwin-16)
     mini_portile2 (2.0.0)
     minitest (5.10.2)
     net-ssh (4.1.0)
@@ -75,4 +75,4 @@ DEPENDENCIES
   rake (~> 11.1)
 
 BUNDLED WITH
-   1.14.6
+   1.15.0

data/lib/kumogata/template/iam.rb

@@ -200,6 +200,10 @@ def _iam_arn(service, resource)
     (args.size == 1) ? array.first : array
   end
 
+  def _convert_resource(args)
+    (args.size == 1) ? args.first : args
+  end
+
   arn_prefix = "arn:aws:#{service}"
   case service
   when "s3"
@@ -236,29 +240,51 @@ def _iam_arn(service, resource)
     if resource == "*"
       resource
     else
-      resource = [ { region: resource[:region], account_id: resource[:account_id], stack: resource[:stack] } ] if resource.is_a? String
-      resource.collect{|v| "#{arn_prefix}:#{v[:region]}:#{v[:account_id]}:stack/#{v[:stack]}" }
+      resource = [ resource ] if resource.is_a? Hash
+      resource.collect!{|v| "#{arn_prefix}:#{v[:region]}:#{v[:account_id]}:stack/#{v[:stack]}" }
+      _convert_resource(resource)
     end
 
   when "iam"
-    if resource.key? :sts
-      "arn:aws:sts::#{resource[:account_id]}:#{resource[:type]}/#{resource[:user]}"
-    elsif resource.key? :policy
-      "arn:aws:iam::aws:policy/#{_iam_to_policy(resource[:policy])}"
-    elsif resource.key? :root
-      "#{arn_prefix}::#{resource[:account_id]}:root"
-    else
-      "#{arn_prefix}::#{resource[:account_id]}:#{resource[:type]}/#{resource[:user]}"
+    resource = [ resource ] if resource.is_a? Hash
+    resource.collect! do |v|
+      if v.key? :sts
+        "arn:aws:sts::#{v[:account_id]}:#{v[:type]}/#{v[:user]}"
+      elsif v.key? :policy
+        "arn:aws:iam::aws:policy/#{_iam_to_policy(v[:policy])}"
+      elsif v.key? :root
+        "#{arn_prefix}::#{v[:account_id]}:root"
+      else
+        "#{arn_prefix}::#{v[:account_id]}:#{v[:type]}/#{v[:user]}"
+      end
     end
+    _convert_resource(resource)
 
   when "elasticloadbalancing"
-    resource.collect{|v| "#{arn_prefix}:*:*:loadbalancer/#{v}" }
+    resource = [ resource ] if resource.is_a? String
+    resource.collect!{|v| "#{arn_prefix}:*:*:loadbalancer/#{v}" }
+    _convert_resource(resource)
 
   when "logs"
     "#{arn_prefix}:*:*:*"
 
   when "kinesis"
-    "#{arn_prefix}:#{resource[:region]}:#{resource[:account_id]}:#{resource[:type]}/#{resource[:name]}"
+    resource = [ resource ] if resource.is_a? Hash
+    resource.collect!{|v| "#{arn_prefix}:#{v[:region]}:#{v[:account_id]}:#{v[:type]}/#{v[:name]}" }
+    _convert_resource(resource)
+
+  when "lambda"
+    resource = [ resource ] if resource.is_a? Hash
+    resource.collect! do |v|
+      v[:type] = "function" unless v.key? :type
+      "#{arn_prefix}:#{v[:region]}:#{v[:account_id]}:#{v[:type]}:#{v[:name]}"
+    end
+    _convert_resource(resource)
+
+  when "ses"
+    resource = [ resource ] if resource.is_a? String
+    resource.collect!{|v| "#{arn_prefix}:#{v}" }
+    _convert_resource(resource)
   end
 end
 

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.28'
+KUMOGATA_TEMPLATE_VERSION = '0.0.29'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -415,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Template for Kumogata.