kumogata-template 0.0.35 → 0.0.36

data/template/cognito-user-pool.rb

@@ -0,0 +1,45 @@
+#
+# Cognito User Pool resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/cognito'
+
+name = _resource_name(args[:name], "user pool")
+admin_config = _cognito_admin_config(args)
+aliases = args[:aliases] || [] # phone_number, email, and/or preferred_username
+auto_verifies = args[:auto_verifies] || [ "email" ] # email and/or phone_number
+device_config = _cognito_device_config(args)
+email_config = _cognito_email_config(args)
+email_verify = _cognito_email_verify(args)
+lambda_config = _cognito_lambda_config(args)
+mfa = _valid_values(args[:mfa], %w( off on optional ), "")
+policies = _cognito_policies(args)
+pool_name = _name("pool", args)
+schemas = _cognito_schemas(args)
+sms_auth = args[:sms_auth] || ""
+sms_config = _cognito_sms_config(args)
+sms_verify = _ref_string_default("sms_verify", args)
+tags = _tags_string(args, "pool")
+
+_(name) do
+  Type "AWS::Cognito::UserPool"
+  Properties do
+    AdminCreateUserConfig admin_config unless admin_config.empty?
+    AliasAttributes aliases unless aliases.empty?
+    AutoVerifiedAttributes auto_verifies
+    DeviceConfiguration device_config unless device_config.empty?
+    EmailConfiguration email_config unless email_config.empty?
+    EmailVerificationMessage email_verify[:message] unless email_verify.empty?
+    EmailVerificationSubject email_verify[:subject] unless email_verify.empty?
+    LambdaConfig lambda_config unless lambda_config.empty?
+    MfaConfiguration mfa.upcase unless mfa.empty?
+    Policies policies
+    UserPoolName pool_name
+    Schema schemas unless schemas.empty?
+    SmsAuthenticationMessage sms_auth unless sms_auth.empty?
+    SmsConfiguration sms_config unless sms_config.empty?
+    SmsVerificationMessage sms_verify unless sms_verify.empty?
+    UserPoolTags tags
+  end
+end

data/template/datapipeline-pipeline.rb

@@ -7,19 +7,19 @@ require 'kumogata/template/datapipeline'
 
 name = _resource_name(args[:name], "pipeline")
 active = _bool("active", args, true)
-description = args[:description] || ""
-pipeline_name = _ref_name("pl_name", args)
+description = _ref_string_default("description", args, '', "#{args[:name]} pipeline description")
+pipeline = _name("pipeline", args)
 parameter_objects = _datapipeline_parameter_objects(args)
 parameter_values = _datapipeline_parameter_values(args)
 pipeline_objects = _datapipeline_pipeline_objects(args)
-pipeline_tags = _datapipeline_pipeline_tags(args)
+pipeline_tags = _tags(args, "pipeline")
 
 _(name) do
   Type "AWS::DataPipeline::Pipeline"
   Properties do
     Activate active
     Description description unless description.empty?
-    Name pipeline_name
+    Name pipeline
     ParameterObjects parameter_objects unless parameter_objects.empty?
     ParameterValues parameter_values unless parameter_values.empty?
     PipelineObjects pipeline_objects

data/template/dynamodb-table.rb

@@ -17,7 +17,9 @@ stream =
   else
     []
   end
-table = _ref_name("table", args)
+table = _name("table", args)
+tags = _tags(args, "table")
+ttl = _dynamodb_ttl(args)
 
 _(name) do
   Type "AWS::DynamoDB::Table"
@@ -29,5 +31,7 @@ _(name) do
     ProvisionedThroughput provisioned
     StreamSpecification stream unless stream.empty?
     TableName table
+    Tags tags
+    TimeToLiveSpecification ttl unless ttl.empty?
   end
 end

data/template/ec2-eip-association.rb

@@ -15,7 +15,7 @@ _(name) do
   Type "AWS::EC2::EIPAssociation"
   Properties do
     AllocationId allocation
-    EIP eip
+    EIP eip unless eip.empty?
     InstanceId instance unless instance.empty?
     NetworkInterfaceId network unless network.empty?
     PrivateIpAddress private_ip unless private_ip.empty?

data/template/ec2-instance.rb

@@ -5,6 +5,9 @@
 require 'kumogata/template/helper'
 require 'kumogata/template/ec2'
 
+args[:block_device] = [] unless args.key? :block_device
+args[:block_device] += _ec2_to_block_device_ecs(args) if args.key? :ecs
+
 name = _resource_name(args[:name], "instance")
 instance_type = _ref_string("instance_type", args, "instance type")
 affinity = _valid_values(args[:affinity], %w( host default ), "")
@@ -13,7 +16,7 @@ block_device = (args[:block_device] || []).collect{|v| _ec2_block_device(v) }
 disable_termination = _bool("disable_termination", args, false)
 host_id = args[:host_id] || ""
 iam_instance = _ref_string("iam_instance", args, "iam instance profile")
-image =_ec2_image(instance_type, args)
+image =_ec2_image(args)
 instance_initiated = args[:instance_initiated] || "stop"
 ipv6_addresses = args[:ipv6_addresses] || []
 kernel = args[:kernel] || ""

data/template/ec2-nat-gateway.rb

@@ -7,11 +7,15 @@ require 'kumogata/template/helper'
 name = _resource_name(args[:name], "nat gateway")
 allocation = _ref_attr_string("allocation", "AllocationId", args, "eip")
 subnet = _ref_string("subnet", args, "subnet")
+tags = _tags(args)
+depends = _depends([ { ref_allocation: 'eip' } ], args)
 
 _(name) do
   Type "AWS::EC2::NatGateway"
   Properties do
     AllocationId allocation
     SubnetId subnet
+    Tags tags
   end
+  DependsOn depends unless depends.empty?
 end

data/template/ec2-route.rb

@@ -7,18 +7,21 @@ require 'kumogata/template/helper'
 name = _resource_name(args[:name], "route")
 destination_cidr = args[:destination_cidr] || "0.0.0.0/0"
 destination_cidr_ipv6 = args[:destination_cidr_ipv6] || ""
+egress_only = _ref_string("engress_only", args)
 gateway = _ref_string("gateway", args, "internet gateway")
 instance = _ref_string("instance", args, "intance")
 nat_gateway = _ref_string("nat_gateway", args, "nat gateway")
 network_interface = _ref_string("network_interface", args)
 route_table = _ref_string("route_table", args, "route table")
 vpc_peering_connection = _ref_string("vpc_peering_connection", args)
+depends = _depends([ { ref_nat_gateway: 'nat gateway' } ], args)
 
 _(name) do
   Type "AWS::EC2::Route"
   Properties do
     DestinationCidrBlock destination_cidr if destination_cidr_ipv6.empty?
     DestinationIpv6CidrBlock destination_cidr_ipv6 if destination_cidr.empty?
+    EgressOnlyInternetGatewayId egress_only unless destination_cidr_ipv6.empty?
     GatewayId gateway unless gateway.empty?
     InstanceId instance unless instance.empty?
     NatGatewayId nat_gateway unless nat_gateway.empty?
@@ -26,4 +29,5 @@ _(name) do
     RouteTableId route_table unless route_table.empty?
     VpcPeeringConnectionId vpc_peering_connection unless vpc_peering_connection.empty?
   end
+  DependsOn depends unless depends.empty?
 end

data/template/ec2-security-group-ingress.rb

@@ -11,7 +11,7 @@ group_id = _ref_string("group_id", args, "security group")
 ingress["GroupId"] = group_id unless group_id.empty?
 group_name = _ref_string("group_name", args, "security group")
 ingress["GroupName"] = group_name unless group_name.empty?
-ingress["GroupName"] = _ref_name("name", args, "security group") if group_name.empty? and group_id.empty?
+ingress["GroupName"] = _ref_string("name", args, "security group") if group_name.empty? and group_id.empty?
 
 _(name) do
   Type "AWS::EC2::SecurityGroupIngress"

data/template/ec2-security-group.rb

@@ -6,8 +6,8 @@ require 'kumogata/template/helper'
 require 'kumogata/template/ec2'
 
 name = _resource_name(args[:name], "security group")
-group_name = _real_name("group", args)
-description = args[:description] || "#{args[:name]} security group description"
+group_name = _name("group", args)
+description = _ref_string_default('description', args, '', "#{args[:name]} security group description")
 egress = _ec2_security_group_egress_rules("egress", args)
 ingress = _ec2_security_group_ingress_rules("ingress", args)
 tags = _tags(args)

data/template/ec2-subnet.rb

@@ -6,18 +6,22 @@ require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "subnet")
 az = _availability_zone(args, false)
-cidr = _ref_string("cidr", args)
-cidr = "10.1.0.0/24" if cidr.empty?
-map_public_ip_on_launch = _bool("map_public_ip_on_launch", args, true)
+cidr = _ref_string_default("cidr", args, "", "10.1.0.0/24")
+ipv6_cidr = _ref_string_default("ipv6_cidr", args)
+public_ip = _bool("public_ip", args, true)
 tags = _tags(args)
 vpc = _ref_string("vpc", args, "vpc")
 
+public_ip = "" unless ipv6_cidr.empty?
+
 _(name) do
   Type "AWS::EC2::Subnet"
   Properties do
+    AssignIPv6AddressOnCreation true unless ipv6_cidr.empty?
     AvailabilityZone az unless az.empty?
     CidrBlock cidr
-    MapPublicIpOnLaunch map_public_ip_on_launch
+    Ipv6CidrBlock ipv6_cidr unless ipv6_cidr.empty?
+    MapPublicIpOnLaunch public_ip
     Tags tags
     VpcId vpc
   end

data/template/ec2-volume.rb

@@ -9,8 +9,7 @@ auto_enable = _bool("auto_enable", args, false)
 az = _availability_zone(args)
 encrypted = _bool("encrypted", args, false)
 iops = args[:iops] || 300
-size = _ref_string("size", args)
-size = 10 if size.empty?
+size = _ref_string_default("size", args, "", 10)
 snapshot = args[:snapshot] || ""
 tags = _tags(args)
 type = _valid_values(args[:type], %w( io1 gp2 sc1 st1 ), "gp2")

data/template/ec2-vpc-cidr-block.rb

@@ -5,13 +5,15 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "vpc cidr block")
-cidr = true
+cidr = _ref_string("cidr", args, false)
+ipv6_cidr = _bool("ipv6_cidr", args, false)
 vpc = _ref_string("vpc", args, "vpc")
 
 _(name) do
   Type "AWS::EC2::VPCCidrBlock"
   Properties do
-    AmazonProvidedIpv6CidrBlock cidr
+    AmazonProvidedIpv6CidrBlock ipv6_cidr
+    CidrBlock cidr unless cidr.empty?
     VpcId vpc
   end
 end

data/template/ec2-vpc-endpoint.rb

@@ -3,10 +3,13 @@
 # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
 #
 require 'kumogata/template/helper'
+require 'kumogata/template/iam'
 
 name = _resource_name(args[:name], "vpc endpoint")
 route_tables = _ref_array("route_tables", args, "route table")
-service_name = "com.amazonaws.#{args[:region]}.s3" # now s3 support only
+region = _ref_string("region", args)
+region = _region if region.empty?
+service = args[:service] || "s3"
 vpc = _ref_string("vpc", args, "vpc")
 
 _(name) do
@@ -17,7 +20,7 @@ _(name) do
       Statement _iam_policy_document("policy_document", args)
     end
     RouteTableIds route_tables
-    ServiceName service_name
+    ServiceName _join([ "com.amazonaws", region, service ], ".")
     VpcId vpc
   end
 end

data/template/ecr-repository.rb

@@ -6,7 +6,7 @@ require 'kumogata/template/helper'
 require 'kumogata/template/ecr'
 
 name = _resource_name(args[:name], "ecr repository")
-repo_name = _ref_name("name", args)
+repo_name = _name("repository", args)
 policy = _ecr_policy("policy", args)
 
 _(name) do
@@ -16,6 +16,6 @@ _(name) do
     RepositoryPolicyText do
       Version "2012-10-17"
       Statement policy
-    end
+    end unless policy.empty?
   end
 end

data/template/ecs-cluster.rb

@@ -5,7 +5,7 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "ecs cluster")
-cluster = _ref_name("cluster", args)
+cluster = _name("cluster", args)
 
 _(name) do
   Type "AWS::ECS::Cluster"

data/template/ecs-service.rb

@@ -6,14 +6,20 @@ require 'kumogata/template/helper'
 require 'kumogata/template/ecs'
 
 name = _resource_name(args[:name], "ecs service")
-cluster = _ref_string("cluster", args, "ecs cluster")
+cluster = _ref_string("cluster", args, "ecs cluster", "arn")
 deployment = _ecs_deployment(args)
-desired = _ref_string("desired_count", args, "ecs desired count")
+desired = _ref_string("desired", args, "ecs desired count")
+health_check = args[:health_check] || ''
+launch_type = _valid_values(args[:launch_type], %w( ec2 fargate ), 'ec2')
 load_balancers = _ecs_load_balancers(args)
-placement = _ecs_placement_service(args)
-role = args[:role] || ""
-service_name = _real_name("service", args)
+network = _ecs_network(args)
+placement_c = _ecs_placement_definition(args, 'placement_c')
+placement_s = _ecs_placement_strategies(args, 'placement_s')
+platform = args[:platform] || ''
+role = _ref_string_default("role", args, "role")
+service = _name("service", args)
 task = _ref_string("task", args, "ecs task definition")
+depends = _depends([ { ref_lb: 'load balancer' } ], args)
 
 _(name) do
   Type "AWS::ECS::Service"
@@ -21,10 +27,16 @@ _(name) do
     Cluster cluster
     DeploymentConfiguration deployment unless deployment.empty?
     DesiredCount desired
+    HealthCheckGracePeriodSeconds health_check unless health_check.empty?
+    LaunchType launch_type.upcase
     LoadBalancers load_balancers unless load_balancers.empty?
-    PlacementConstraints placement unless placement.empty?
+    NetworkConfiguration network unless network.empty?
+    PlacementConstraints placement_c unless placement_c.empty?
+    PlacementStrategies placement_s unless placement_s.empty?
+    PlatformVersion platform unless platform.empty?
     Role role unless role.empty?
-    ServiceName service_name if service_name
+    ServiceName service
     TaskDefinition task
   end
+  DependsOn depends unless depends.empty?
 end

data/template/ecs-task-definition.rb

@@ -7,11 +7,11 @@ require 'kumogata/template/ecs'
 
 name = _resource_name(args[:name], "ecs task definition")
 volumes = _ecs_volumes(args)
-family = args[:family] || ""
-network = _valid_values(args[:network], %w( bridge host none ), "")
+family = _name("family", args)
+network = _valid_values(args[:network], %w( bridge host none ), "bridge")
 placement = _ecs_placement_definition(args)
 role = _ref_attr_string("role", "Arn", args, "role")
-definitions = _ecs_container_definitions(args)
+containers = _ecs_containers(args)
 
 _(name) do
   Type "AWS::ECS::TaskDefinition"
@@ -21,6 +21,6 @@ _(name) do
     NetworkMode network unless network.empty?
     PlacementConstraints placement unless placement.empty?
     TaskRoleArn role unless role.empty?
-    ContainerDefinitions definitions
+    ContainerDefinitions containers
   end
 end

data/template/elasticache-cache-cluster.rb

@@ -12,7 +12,7 @@ azmode = args[:azmode] || ""
 node = _elasticache_to_node(args)
 parameter = _elasticache_to_parameter(args)
 subnet = _ref_string("subnet", args, "cache subnet group")
-cluster = _ref_name("cluster", args, "cache cluster")
+cluster = _name("cluster", args)
 engine_version = _ref_string("engine_version", args, "cache engine version")
 engine_version = ELASTICACHE_DEFAULT_ENGINE_VERSION[engine.to_sym] if engine_version.empty?
 notification = _ref_attr_string("notification", "Arn", args)

data/template/elasticache-parameter-group.rb

@@ -7,7 +7,7 @@ require 'kumogata/template/helper'
 name = _resource_name(args[:name], "cache parameter group")
 family = _ref_string("family", args)
 family = "redis2.8" if family.empty?
-description = args[:description] || "#{args[:name]} cache parameter group description"
+description = _ref_string_default("description", args, '', "#{args[:name]} cache parameter group description")
 properties = args[:properties] || []
 
 _(name) do

data/template/elasticache-replication-group.rb

@@ -21,7 +21,7 @@ port = _ref_string("port", args)
 port = PORT[engine.to_sym] if port.empty?
 azs = _availability_zones(args, false)
 maintenance = _maintenance_window("elasticache", args[:maintenance] || DEFAULT_MAINTENANCE_TIME[:elasticache])
-description = args[:description] || "#{args[:name]} cache replication group description"
+description = _ref_string_default("description", args, '', "#{args[:name]} cache replication group description")
 security_groups = _ref_array("security_groups", args, "security group")
 snapshot_arn = args[:snapshot_arn] || ""
 snapshot_name = args[:snapshot_name] || ""

data/template/elasticache-subnet-group.rb

@@ -6,7 +6,7 @@ require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "cache subnet group")
 subnet = args[:subnet] || ""
-description = args[:description] || "#{args[:name]} cache subnet group description"
+description = _ref_string_default("description", args, '', "#{args[:name]} cache subnet group description")
 subnets = _ref_array("subnets", args, "subnet")
 
 _(name) do

data/template/elasticbeanstalk-application-version.rb

@@ -7,7 +7,7 @@ require 'kumogata/template/helper'
 name = _resource_name(args[:name], "elasticbeanstalk application version")
 application = _ref_string_default("application", args,
                                   "elasticbeanstalk application", args[:name])
-description = _ref_string("description", args)
+description = _ref_string_default("description", args, "", "#{args[:name]} elasticbeanstalk application version description")
 s3_bucket = _join([
                    _ref_string("s3_bucket", args, "bucket"),
                    _region,

data/template/elasticbeanstalk-application.rb

@@ -7,7 +7,7 @@ require 'kumogata/template/helper'
 name = _resource_name(args[:name], "elasticbeanstalk application")
 application = _ref_string("application", args)
 application = args[:name] if application.empty?
-description = _ref_string("description", args)
+description = _ref_string_default("description", args, '', "#{args[:name]} elasticbeanstalk application description")
 
 _(name) do
   Type "AWS::ElasticBeanstalk::Application"

data/template/elasticbeanstalk-configuration-template.rb

@@ -7,7 +7,7 @@ require 'kumogata/template/elasticbeanstalk'
 
 name = _resource_name(args[:name], "elasticbeanstalk configuration template")
 application = _ref_string("application", args, "elasticbeanstalk application")
-description = args[:description] || ""
+description = _ref_string_default("description", args, '', "#{args[:name]} elasticbeanstalk configuration template description")
 options =
   if args.key? :options
     _elasticbeanstalk_options(args[:options])

data/template/elasticbeanstalk-environment.rb

@@ -8,7 +8,7 @@ require 'kumogata/template/elasticbeanstalk'
 name = _resource_name(args[:name], "elasticbeanstalk environment")
 application = _ref_string("application", args, "elasticbeanstalk application")
 cname = _ref_string("cname", args)
-description = _ref_string("description", args)
+description = _ref_string_default("description", args, '', "#{args[:name]} elasticbeanstalk environment description")
 environment = _ref_string("environment", args)
 options =
   if args.key? :options

data/template/elb-load-balancer.rb

@@ -15,13 +15,13 @@ cross = _bool("cross", args, true)
 health = _elb_health_check(args)
 instances = _ref_array("instances", args, "instance")
 cookie = _elb_cookie_stickiness_policy(args)
-lb_name = _ref_name("lb_name", args)
+lb_name = _name("lb_name", args)
 listeners = _elb_listeners(args)
 policies = _elb_policy_types(args)
 scheme = _valid_values("scheme", %w( internal internal-facing ), "")
 security_groups = _ref_array("security_groups", args, "security group")
 subnets = _ref_array("subnets", args, "subnet")
-tags = _tags(args)
+tags = _tags(args, "lb_name")
 
 _(name) do
   Type "AWS::ElasticLoadBalancing::LoadBalancer"

data/template/emr-cluster.rb

@@ -18,10 +18,10 @@ configurations = _emr_configurations(args)
 instance = _emr_job_flow(args)
 job_flow_role = args[:job_flow_role] || "EMR_EC2_DefaultRole"
 log = args[:log] || ""
-cluster_name = _ref_name("cluster", args)
+cluster = _name("cluster", args)
 release = args[:release] || EMR_DEFAULT_RELEASE
 service_role = args[:service_role] || "EMR_DefaultRole"
-tags = _tags(args)
+tags = _tags(args, "cluster")
 visible = _bool("visible", args, false)
 
 _(name) do
@@ -35,7 +35,7 @@ _(name) do
     Instances instance
     JobFlowRole String job_flow_role
     LogUri log unless log.empty?
-    Name cluster_name
+    Name cluster
     ReleaseLabel release
     ServiceRole service_role
     Tags tags

data/template/emr-instance-group-config.rb

@@ -6,6 +6,7 @@ require 'kumogata/template/helper'
 require 'kumogata/template/emr'
 
 name = _resource_name(args[:name], "emr instance group config")
+autoscaling = _emr_instance_autoscaling(args)
 bid = args[:bid] || ""
 configurations = args[:configurations] || []
 ebs = _emr_ebs(args)
@@ -15,11 +16,12 @@ instance_type = _ref_string("instance_type", args, "instance type")
 instance_type = EMR_DEFAULT_INSTANCE_TYPE  if instance_type.empty?
 cluster = _ref_string("cluster", args, "emr cluster")
 market = _valid_values("market", %w( on_demand, spot), "on_demand")
-config_name = _ref_name("config_name", args)
+config = _name("config", args)
 
 _(name) do
   Type "AWS::EMR::InstanceGroupConfig"
   Properties do
+    AutoScalingPolicy autoscaling unless autoscaling.empty?
     BidPrice bid unless bid.empty?
     Configurations configurations unless configurations.empty?
     EbsConfiguration ebs  unless ebs.empty?
@@ -28,6 +30,6 @@ _(name) do
     InstanceType instance_type
     JobFlowId cluster
     Market market.upcase
-    Name config_name
+    Name config
   end
 end

data/template/emr-security-configuration.rb

@@ -0,0 +1,17 @@
+#
+# EMR security configuration
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "emr security configuration")
+security = _name("security", args)
+configuration = args[:configuration] || {}
+
+_(name) do
+  Type "AWS::EMR::SecurityConfiguration"
+  Properties do
+    Name security
+    SecurityConfiguration configuration
+  end
+end

data/template/emr-step.rb

@@ -9,7 +9,7 @@ name = _resource_name(args[:name], "emr step")
 action = _valid_values(args[:action], %w( continue continue_and_wait ), "continue")
 hadoop = _emr_hadoop_jar_step_config(args)
 cluster = _ref_string("cluster", args, "emr cluster")
-step_name = _ref_name("step_name", args)
+step = _name("step", args)
 
 _(name) do
   Type "AWS::EMR::Step"
@@ -17,6 +17,6 @@ _(name) do
     ActionOnFailure action.upcase
     HadoopJarStep hadoop
     JobFlowId cluster
-    Name step_name
+    Name step
   end
 end

data/template/events-rule.rb

@@ -6,23 +6,23 @@ require 'kumogata/template/helper'
 require 'kumogata/template/events'
 
 name = _resource_name(args[:name], "events rule")
-description = args[:description] || ""
+description = _ref_string_default("description", args, '', "#{args[:name]} events rule description")
 pattern = _events_pattern(args)
-role = _ref_attr_string("role", "Arn", args, "role")
-event_name = _ref_name("event", args)
-schedule = args[:schedule] || ""
+event = _name("event", args)
+schedule = _events_to_schedule_expression(args[:schedule])
 state = _valid_values(args[:state], %w( enabled disabled ), "enabled")
 targets = _events_targets(args)
+depends = _depends([ { ref_lambda_function: 'lambda function' } ], args)
 
 _(name) do
   Type "AWS::Events::Rule"
   Properties do
     Description description unless description.empty?
-    EventPattern pattern unless schedule.empty?
-    Name event_name
-    RoleArn role unless role.empty?
-    ScheduleExpression schedule unless schedule.empty?
+    EventPattern pattern if schedule.empty?
+    Name event
+    ScheduleExpression schedule if pattern.empty?
     State state.upcase
     Targets targets unless targets.empty?
   end
+  DependsOn depends unless depends.empty?
 end

data/template/iam-group.rb

@@ -6,7 +6,7 @@ require 'kumogata/template/helper'
 require 'kumogata/template/iam'
 
 name = _resource_name(args[:name], "group")
-group_name = _real_name("group", args)
+group = _name("group", args)
 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_name if group_name
+    GroupName group
     ManagedPolicyArns managed_policies unless managed_policies.empty?
     Path path
     Policies policies unless policies.empty?

data/template/iam-instance-profile.rb

@@ -7,13 +7,13 @@ require 'kumogata/template/helper'
 name = _resource_name(args[:name], "instance profile")
 path = args[:path] || "/"
 roles = _ref_array("roles", args, "role")
-profile_name = _real_name("profile", args)
+profile = _name("profile", args)
 
 _(name) do
   Type "AWS::IAM::InstanceProfile"
   Properties do
     Path path
     Roles roles
-    InstanceProfileName profile_name if profile_name
+    InstanceProfileName profile
   end
 end

data/template/iam-managed-policy.rb

@@ -6,7 +6,7 @@ require 'kumogata/template/helper'
 require 'kumogata/template/iam'
 
 name = _resource_name(args[:name], "managed policy")
-description = args[:description] || ""
+description = _ref_string_default("description", args, '', "#{args[:name]} managed policy description")
 groups = _ref_array("groups", args)
 path = args[:path] || "/"
 roles = _ref_array("roles", args)

data/template/iam-policy.rb

@@ -7,7 +7,7 @@ require 'kumogata/template/iam'
 
 name = _resource_name(args[:name], "policy")
 groups = _ref_array("groups", args, "group")
-policy = _ref_name("policy", args)
+policy = _name("policy", args)
 roles = _ref_array("roles", args, "role")
 users = _ref_array("users", args, "user")