kumogata-template 0.0.33 → 0.0.34

data/template/ec2-vpc-dhcp-options-association.rb

@@ -0,0 +1,17 @@
+#
+# EC2 VPC DHCP Options Association resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-dhcp-options-assoc.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "vpc dhcp options association")
+dhcp = _ref_string("dhcp", args, "dhcp options")
+vpc = _ref_string("vpc", args, "vpc")
+
+_(name) do
+  Type "AWS::EC2::VPCDHCPOptionsAssociation"
+  Properties do
+    DhcpOptionsId dhcp
+    VpcId vpc
+  end
+end

data/template/ec2-vpc-peering-connection.rb

@@ -0,0 +1,23 @@
+#
+# EC2 VPC Peerning Connection resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "vpc peering connection")
+peer_vpc = _ref_string("peer_vpc", args, "vpc")
+tags = _tags(args)
+vpc = _ref_string("vpc", args, "vpc")
+peer_owner = _ref_string("peer_owner", args, "peer owner")
+peer_role = _ref_attr_string("peer_role", "Arn", args, "role")
+
+_(name) do
+  Type "AWS::EC2::VPCPeeringConnection"
+  Properties do
+    PeerVpcId peer_vpc
+    Tags tags
+    VpcId vpc
+    PeerOwnerId peer_owner unless peer_owner.empty?
+    PeerRoleArn peer_role unless peer_role.empty?
+  end
+end

data/template/ec2-vpn-connection-route.rb

@@ -0,0 +1,17 @@
+#
+# EC2 VPN Connection Route resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection-route.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "vpn connection route")
+cidr = _ref_string("cidr", args, "cidr")
+vpn = _ref_string("vpn", args, "vpn connection")
+
+_(name) do
+  Type "AWS::EC2::VPNConnectionRoute"
+  Properties do
+    DestinationCidrBlock cidr
+    VpnConnectionId vpn
+  end
+end

data/template/ec2-vpn-connection.rb

@@ -0,0 +1,23 @@
+#
+# EC2 VPN Connection resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "vpn connection")
+type = _ref_string("type", args)
+customer = _ref_string("customer", args, "customer gateway")
+static = true
+tags = _tags(args)
+vpn = _ref_string("vpn", args, "vpn gateway")
+
+_(name) do
+  Type "AWS::EC2::VPNConnection"
+  Properties do
+    Type type
+    CustomerGatewayId customer
+    StaticRoutesOnly static
+    Tags tags
+    VpnGatewayId vpn
+  end
+end

data/template/ec2-vpn-gateway-route-propagation.rb

@@ -0,0 +1,17 @@
+#
+# EC2 VPN Gateway Route Propagation resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gatewayrouteprop.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "vpn gateway route propagation")
+routes = _ref_array("routes", args, "route table")
+vpn = _ref_string("vpn", args, "vpn gateway")
+
+_(name) do
+  Type "AWS::EC2::VPNGatewayRoutePropagation"
+  Properties do
+    RouteTableIds routes
+    VpnGatewayId vpn
+  end
+end

data/template/ec2-vpn-gateway.rb

@@ -0,0 +1,17 @@
+#
+# EC2 VPN Gateway resource
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html
+#
+require 'kumogata/template/helper'
+
+name = _resource_name(args[:name], "vpn gateway")
+type = _ref_string("type", args)
+tags = _tags(args)
+
+_(name) do
+  Type "AWS::EC2::VPNGateway"
+  Properties do
+    Type type
+    Tags tags
+  end
+end

data/template/ecs-service.rb

@@ -12,7 +12,7 @@ desired = _ref_string("desired_count", args, "ecs desired count")
 load_balancers = _ecs_load_balancers(args)
 placement = _ecs_placement_service(args)
 role = args[:role] || ""
-service_name = _real_name(args[:service_name] || "")
+service_name = _real_name("service", args)
 task = _ref_string("task", args, "ecs task definition")
 
 _(name) do
@@ -24,7 +24,7 @@ _(name) do
     LoadBalancers load_balancers unless load_balancers.empty?
     PlacementConstraints placement unless placement.empty?
     Role role unless role.empty?
-    ServiceName service_name unless service_name.empty?
+    ServiceName service_name if service_name
     TaskDefinition task
   end
 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 = _real_name(args[:group] || args[:name])
+group_name = _real_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
+    GroupName group_name if group_name
     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(args[:profile_name] || "")
+profile_name = _real_name("profile", args)
 
 _(name) do
   Type "AWS::IAM::InstanceProfile"
   Properties do
     Path path
     Roles roles
-    InstanceProfileName profile_name unless profile_name.empty?
+    InstanceProfileName profile_name if profile_name
   end
 end

data/template/iam-role.rb

@@ -15,7 +15,7 @@ managed_policies =
   end
 path = args[:path] || "/"
 policies = _iam_policies("policies", args)
-role = _real_name(args[:role] || args[:name])
+role_name = _real_name("role", args)
 
 _(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
+    RoleName role_name if role_name
   end
 end

data/template/iam-user.rb

@@ -21,7 +21,7 @@ managed_policies =
   end
 path = args[:path] || "/"
 policies = _iam_policies("policies", args)
-user = _real_name(args[:user] || args[:name])
+user = _real_name("user", args)
 
 _(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
+    UserName user if user
   end
 end

data/template/output-access-key.rb

@@ -4,8 +4,8 @@
 require 'kumogata/template/helper'
 
 _output "#{args[:name]} access key",
-        ref_value: args[:name],
+        ref_value: "#{args[:name]} access key",
         export: _export_string(args, "access key")
 _output "#{args[:name]} secret access key",
-        ref_value: [ args[:name], "SecretAccessKey" ],
+        ref_value: [ "#{args[:name]} access key", "SecretAccessKey" ],
         export: _export_string(args, "secret access key")

data/template/{output-iam-instance-profile.rb → output-instance-profile.rb}

@@ -1,5 +1,5 @@
 #
-# Output IAM instance profile
+# Output instance profile
 #
 require 'kumogata/template/helper'
 

data/template/output-network-interface.rb

@@ -0,0 +1,14 @@
+#
+# Output network interface
+#
+require 'kumogata/template/helper'
+
+_output "#{args[:name]} network interface",
+        ref_value: "#{args[:name]} network interface",
+        export: _export_string(args, "network interface")
+_output "#{args[:name]} network interface private ip",
+        ref_value: [ "#{args[:name]} network interface", "PrimaryPrivateIpAddress" ],
+        export: _export_string(args, "network interface private ip")
+_output "#{args[:name]} network interface secondary ips",
+        ref_value: [ "#{args[:name]} network interface", "SecondaryPrivateIpAddresses" ],
+        export: _export_string(args, "network interface secondary ips")

data/template/{output-iam-role.rb → output-role.rb}

@@ -1,5 +1,5 @@
 #
-# Output IAM role
+# Output role
 #
 require 'kumogata/template/helper'
 

data/template/{output-ec2-subnet.rb → output-subnet.rb}

@@ -1,5 +1,5 @@
 #
-# Output ec2 subnet
+# Output subnet
 #
 require 'kumogata/template/helper'
 

data/template/rds-db-instance.rb

@@ -44,9 +44,11 @@ iops =
     ""
   end
 kms = _ref_attr_string("kms", "Arn", args)
-license = _valid_values(args[:license], %w( license-included bring-your-own-license general-public-license ), "general-public-license")
+license = _valid_values(args[:license], %w( license-included bring-your-own-license general-public-license ))
 user_name = _ref_string("user_name", args, "db master user name")
 user_password = _ref_string("user_password", args, "db master user password")
+monitoring_interval = _ref_number("monitoring_interval", args, "db monitoring interval")
+monitoring_role_arn = _ref_string("monitoring_role_arn", args, "db monitoring role arn")
 multi_az = _bool("multi_az", args, false)
 option = _ref_string("option", args, "db option group")
 port = _ref_string_default("port", args, "db port", PORT[engine.to_sym])
@@ -154,6 +156,8 @@ _(name) do
     LicenseModel license unless _empty? license
     MasterUsername user_name unless _empty? user_name
     MasterUserPassword user_password unless _empty? user_password
+    MonitoringInterval monitoring_interval unless _empty? monitoring_interval
+    MonitoringRoleArn monitoring_role_arn unless _empty? monitoring_role_arn
     MultiAZ multi_az unless _empty? multi_az
     OptionGroupName option unless _empty? option
     Port port unless _empty? port

data/template/s3-bucket.rb

@@ -21,8 +21,7 @@ replication = _s3_replication(args)
 tags = _tags(args)
 versioning = _s3_versioning(args)
 website = _s3_website(args)
-deletion_policy = _valid_values(args[:deletion_policy],
-                                %w( Delete Retain Snapshot ), "Retain")
+deletion_policy = _s3_to_deletion_policy(args[:deletion_policy])
 
 _(name) do
   Type "AWS::S3::Bucket"

data/template/sns-topic.rb

@@ -6,9 +6,9 @@ require 'kumogata/template/helper'
 require 'kumogata/template/sns'
 
 name = _resource_name(args[:name], "topic")
-display = args[:display] || ""
+display = _real_name("display", args)
 subscription = _sns_subscription_list(args)
-topic = _ref_name("topic", args)
+topic = _real_name("topic", args)
 
 _(name) do
   Type "AWS::SNS::Topic"

data/test/ec2_test.rb

@@ -110,10 +110,10 @@ Test _ec2_tags(name: "test", tags_append: { ref_test: "test" })
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_ec2_security_group_egresses
+  def test_ec2_security_group_egress_rules
     template = <<-EOS
-args = { egress: [ to: 80, group: "test" ] }
-Test _ec2_security_group_egresses("egress", args)
+args = { egress: [ to: 80 ] }
+Test _ec2_security_group_egress_rules("egress", args)
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -122,7 +122,6 @@ Test _ec2_security_group_egresses("egress", args)
     {
       "CidrIp": "0.0.0.0/0",
       "FromPort": "80",
-      "GroupId": "test",
       "IpProtocol": "tcp",
       "ToPort": "80"
     }
@@ -132,8 +131,8 @@ Test _ec2_security_group_egresses("egress", args)
     assert_equal exp_template.chomp, act_template
 
     template = <<-EOS
-args = { egress: [ to: 80, group: "test" ] }
-Test _ec2_security_group_egresses("egress", args)
+args = { egress: [ to: 80 ] }
+Test _ec2_security_group_egress_rules("egress", args)
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -142,7 +141,6 @@ Test _ec2_security_group_egresses("egress", args)
     {
       "CidrIp": "0.0.0.0/0",
       "FromPort": "80",
-      "GroupId": "test",
       "IpProtocol": "tcp",
       "ToPort": "80"
     }
@@ -152,9 +150,9 @@ Test _ec2_security_group_egresses("egress", args)
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_ec2_security_group_eggress
+  def test_ec2_security_group_egress_rule
     template = <<-EOS
-Test _ec2_security_group_egress(to: 80, group: "test")
+Test _ec2_security_group_egress_rule(to: 80)
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -162,7 +160,6 @@ Test _ec2_security_group_egress(to: 80, group: "test")
   "Test": {
     "CidrIp": "0.0.0.0/0",
     "FromPort": "80",
-    "GroupId": "test",
     "IpProtocol": "tcp",
     "ToPort": "80"
   }
@@ -171,10 +168,10 @@ Test _ec2_security_group_egress(to: 80, group: "test")
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_ec2_security_group_ingresses
+  def test_ec2_security_group_ingress_rules
     template = <<-EOS
 args = { ingress: [ from: 80 ] }
-Test _ec2_security_group_ingresses("ingress", args)
+Test _ec2_security_group_ingress_rules("ingress", args)
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -193,7 +190,7 @@ Test _ec2_security_group_ingresses("ingress", args)
 
     template = <<-EOS
 args = { ingress: [ 22, 80 ] }
-Test _ec2_security_group_ingresses("ingress", args)
+Test _ec2_security_group_ingress_rules("ingress", args)
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -217,9 +214,9 @@ Test _ec2_security_group_ingresses("ingress", args)
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_ec2_security_group_ingress
+  def test_ec2_security_group_ingress_rule
     template = <<-EOS
-Test _ec2_security_group_ingress(from: 80)
+Test _ec2_security_group_ingress_rule(from: 80)
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -257,9 +254,9 @@ Test _ec2_block_device(ref_size: "test")
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_ec2_network_interface
+  def test_ec2_network_interface_embedded
     template = <<-EOS
-Test _ec2_network_interface(ref_subnet_id: "test")
+Test _ec2_network_interface_embedded(ref_subnet: "test")
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -268,7 +265,9 @@ Test _ec2_network_interface(ref_subnet_id: "test")
     "AssociatePublicIpAddress": "true",
     "DeleteOnTermination": "true",
     "DeviceIndex": "0",
-    "SubnetId": ""
+    "SubnetId": {
+      "Ref": "TestSubnet"
+    }
   }
 }
     EOS

data/test/helper_test.rb

@@ -83,7 +83,9 @@ EOS
   end
 
   def test_real_name
-    assert_equal _real_name("test test"), "test-test"
+    assert_equal _real_name("test", { name: "test" }), "test"
+    assert_equal _real_name("test", { name: "test", test: "test test" }), "test-test"
+    assert_equal _real_name("test", { name: "test", test: false }), false
   end
 
   def test_ref_key
@@ -602,7 +604,7 @@ Test _base64_shell("test shell")
     exp_template = <<-EOS
 {
   "Test": {
-    "Fn::Base64": "#!/bin/bash\\ntest shell"
+    "Fn::Base64": "#!/bin/bash\\ntest shell\\n"
   }
 }
     EOS

data/test/sns_test.rb

@@ -3,6 +3,22 @@ require 'kumogata/template/sns'
 
 class SnsTest < Minitest::Test
   def test_sns_subscription
+    template = <<-EOS
+Test _sns_subscription_list(subscription: [ "test" ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": [
+    {
+      "Endpoint": "test",
+      "Protocol": "email"
+    }
+  ]
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
     template = <<-EOS
 Test _sns_subscription_list(subscription: [ { protocol: "lambda", endpoint: "test" } ])
     EOS

data/test/template/ec2-customer-gateway_tet.rb

@@ -0,0 +1,55 @@
+require 'abstract_unit'
+
+class Ec2CustomerGatewayTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_ec2_customer_gateway "test", ref_bgp: "test", ref_ip: "test", type: "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestCustomerGateway": {
+    "Type": "AWS::EC2::CustomerGateway",
+    "Properties": {
+      "BgpAsn": {
+        "Ref": "TestBgp"
+      },
+      "IpAddress": {
+        "Ref": "TestIp"
+      },
+      "Tags": [
+        {
+          "Key": "Name",
+          "Value": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test"
+              ]
+            ]
+          }
+        },
+        {
+          "Key": "Service",
+          "Value": {
+            "Ref": "Service"
+          }
+        },
+        {
+          "Key": "Version",
+          "Value": {
+            "Ref": "Version"
+          }
+        }
+      ],
+      "Type": "test"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/ec2-dhcp-options_test.rb

@@ -0,0 +1,49 @@
+require 'abstract_unit'
+
+class Ec2DhcpOptionsTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_ec2_dhcp_options "test", domain_name: "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestDhcpOptions": {
+    "Type": "AWS::EC2::DHCPOptions",
+    "Properties": {
+      "DomainName": "test",
+      "Tags": [
+        {
+          "Key": "Name",
+          "Value": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test"
+              ]
+            ]
+          }
+        },
+        {
+          "Key": "Service",
+          "Value": {
+            "Ref": "Service"
+          }
+        },
+        {
+          "Key": "Version",
+          "Value": {
+            "Ref": "Version"
+          }
+        }
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/ec2-egress-only-internet-gateway_test.rb

@@ -0,0 +1,23 @@
+require 'abstract_unit'
+
+class Ec2EgressOnlyInternetGatewayTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_ec2_egress_only_internet_gateway "test", ref_vpc: "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestEgressOnlyInternetGateway": {
+    "Type": "AWS::EC2::EgressOnlyInternetGateway",
+    "Properties": {
+      "VpcId": {
+        "Ref": "TestVpc"
+      }
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/ec2-instance_test.rb

@@ -84,7 +84,7 @@ _ec2_instance "test", key_name: "test", ref_instance_type: "test", ref_iam_insta
       ],
       "Tenancy": "default",
       "UserData": {
-        "Fn::Base64": "#!/bin/bash\\ntest data"
+        "Fn::Base64": "#!/bin/bash\\ntest data\\n"
       }
     }
   }

data/test/template/ec2-network-interface-attachment_tet.rb

@@ -0,0 +1,28 @@
+require 'abstract_unit'
+
+class Ec2NetworkInterfaceAttachmentTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_ec2_network_interface_attachment "test", ref_instance: "test", ref_network: "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestNetworkInterfaceAttachment": {
+    "Type": "AWS::EC2::NetworkInterfaceAttachment",
+    "Properties": {
+      "DeleteOnTermination": "true",
+      "DeviceIndex": "0",
+      "InstanceId": {
+        "Ref": "TestInstance"
+      },
+      "NetworkInterfaceId": {
+        "Ref": "TestNetworkInterface"
+      }
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end