kumogata-template 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063912b82b18c9a130a16a05acb748d59290cd50
-  data.tar.gz: 7bdaf0c062c96726fa3960d05a5989fa4c8f6272
+  metadata.gz: cfb8da003274134b052eccee417405a9152c339a
+  data.tar.gz: 4df892faee4b82571c4a7453ffea99d8234c3d32
 SHA512:
-  metadata.gz: 171ad99cf8879e2d58ad3e6eb8f693ab89dea17f39fc823e5e0581164ee644df209a4464d15a4be38147240bb4402c8b5b3c9893a7f70a332dda142a6735d55c
-  data.tar.gz: 01ed15da699434d6820e494a7023391abc01993bf93a8643b02c277e3635d0ed906fff3df3aab29a26588c39218e7b8358802043d763dc1d3a78ffcd6ff27661
+  metadata.gz: 7dfa6687d54fb12e4d60f1559c93685108fdaede85d40f46541b719b16413a63d803a907bb15788fae30854426eb71aa2401ed0693ab344d404759e9f871d1e7
+  data.tar.gz: f5a84d413471ab5e4b2f1086866554842610114f5a3f70ad218fe50e23c7f87dd3f3bc171fe47f69785764440d77c3e3079f82b6b255b08b895ef92293c9f6bc

data/lib/kumogata/template/helper.rb

@@ -40,6 +40,10 @@ def _valid_numbers(value, min = 0, max = 0, default = nil)
   (min <= number and number <= max) ? number : default
 end
 
+def _real_name(name)
+  name.gsub(' ', '-')
+end
+
 def _ref_string(name, args, ref_name = "")
   return args[name.to_sym].to_s || "" unless args.key? "ref_#{name}".to_sym
 

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.9'
+KUMOGATA_TEMPLATE_VERSION = '0.0.10'

data/template/iam-group.rb

@@ -6,7 +6,7 @@ require 'kumogata/template/helper'
 require 'kumogata/template/iam'
 
 name = _resource_name(args[:name], "group")
-group = args[:group] || ""
+group = _real_name(args[:group] || args[:name])
 managed_policies =
   if args.key? :managed_policies
     _iam_managed_policies(args)
@@ -19,7 +19,7 @@ policies = _iam_policies("policies", args)
 _(name) do
   Type "AWS::IAM::Group"
   Properties do
-    GroupName group unless group.empty?
+    GroupName group
     ManagedPolicyArns managed_policies unless managed_policies.empty?
     Path path
     Policies policies unless policies.empty?

data/template/iam-role.rb

@@ -15,7 +15,7 @@ managed_policies =
   end
 path = args[:path] || "/"
 policies = _iam_policies("policies", args)
-role = args[:role] || ""
+role = _real_name(args[:role] || args[:name])
 
 _(name) do
   Type "AWS::IAM::Role"
@@ -27,6 +27,6 @@ _(name) do
     ManagedPolicyArns managed_policies unless managed_policies.empty?
     Path path
     Policies policies unless policies.empty?
-    RoleName role unless role.empty?
+    RoleName role
   end
 end

data/template/iam-user.rb

@@ -21,7 +21,7 @@ managed_policies =
   end
 path = args[:path] || "/"
 policies = _iam_policies("policies", args)
-user = args[:user] || ""
+user = _real_name(args[:user] || args[:name])
 
 _(name) do
   Type "AWS::IAM::User"
@@ -31,6 +31,6 @@ _(name) do
     ManagedPolicyArns managed_policies unless managed_policies.empty?
     Path path
     Policies policies unless policies.empty?
-    UserName user unless user.empty?
+    UserName user
   end
 end

data/test/template/iam-group_test.rb

@@ -11,6 +11,7 @@ _iam_group "test"
   "TestGroup": {
     "Type": "AWS::IAM::Group",
     "Properties": {
+      "GroupName": "test",
       "Path": "/"
     }
   }

data/test/template/iam-role_test.rb

@@ -27,7 +27,8 @@ _iam_role "test", user: "test", service: "s3"
           }
         ]
       },
-      "Path": "/"
+      "Path": "/",
+      "RoleName": "test"
     }
   }
 }

data/test/template/iam-user_test.rb

@@ -11,7 +11,8 @@ _iam_user "test"
   "TestUser": {
     "Type": "AWS::IAM::User",
     "Properties": {
-      "Path": "/"
+      "Path": "/",
+      "UserName": "test"
     }
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk