kumogata-template 0.0.35 → 0.0.36

data/test/template/ec2-security-group_test.rb

@@ -11,7 +11,17 @@ _ec2_security_group "test", vpc: "test"
   "TestSecurityGroup": {
     "Type": "AWS::EC2::SecurityGroup",
     "Properties": {
-      "GroupName": "test",
+      "GroupName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
       "GroupDescription": "test security group description",
       "Tags": [
         {

data/test/template/ec2-spot-fleet_test.rb

@@ -22,7 +22,7 @@ _ec2_spot_fleet "test", iam: "test", price: 1000, ref_taget: "test", launches: l
           {
             "BlockDeviceMappings": [
               {
-                "DeviceName": "/dev/sda1",
+                "DeviceName": "/dev/sdb",
                 "Ebs": {
                   "DeleteOnTermination": "true",
                   "VolumeSize": {

data/test/template/ec2-subnet_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class Ec2SubnetTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_ec2_subnet "test", vpc: "test"
+_ec2_subnet "test", { vpc: "test", public_ip: true }
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -44,6 +44,67 @@ _ec2_subnet "test", vpc: "test"
       "VpcId": "test"
     }
   }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_association
+    template = <<-EOS
+name = "test test"
+_ec2_subnet name, { vpc: "test" }
+_ec2_subnet_route_table_association name, ref_route_table: name, ref_subnet: name
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestTestSubnet": {
+    "Type": "AWS::EC2::Subnet",
+    "Properties": {
+      "CidrBlock": "10.1.0.0/24",
+      "MapPublicIpOnLaunch": "true",
+      "Tags": [
+        {
+          "Key": "Name",
+          "Value": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test-test"
+              ]
+            ]
+          }
+        },
+        {
+          "Key": "Service",
+          "Value": {
+            "Ref": "Service"
+          }
+        },
+        {
+          "Key": "Version",
+          "Value": {
+            "Ref": "Version"
+          }
+        }
+      ],
+      "VpcId": "test"
+    }
+  },
+  "TestTestSubnetRouteTableAssociation": {
+    "Type": "AWS::EC2::SubnetRouteTableAssociation",
+    "Properties": {
+      "RouteTableId": {
+        "Ref": "TestTestRouteTable"
+      },
+      "SubnetId": {
+        "Ref": "TestTestSubnet"
+      }
+    }
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/template/ec2-vpc-cidr-block_test.rb

@@ -11,7 +11,7 @@ _ec2_vpc_cidr_block "test", ref_vpc: "test"
   "TestVpcCidrBlock": {
     "Type": "AWS::EC2::VPCCidrBlock",
     "Properties": {
-      "AmazonProvidedIpv6CidrBlock": "true",
+      "AmazonProvidedIpv6CidrBlock": "false",
       "VpcId": {
         "Ref": "TestVpc"
       }

data/test/template/ec2-vpc-endpoint_test.rb

@@ -0,0 +1,56 @@
+require 'abstract_unit'
+
+class Ec2VpcEndpointTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_ec2_vpc_endpoint "test", ref_route_tables: %w( test ), ref_vpc: "test",
+                          policy_document: [ { service: "s3", principal: "*" } ]
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestVpcEndpoint": {
+    "Type": "AWS::EC2::VPCEndpoint",
+    "Properties": {
+      "PolicyDocument": {
+        "Version": "2012-10-17",
+        "Statement": [
+          {
+            "Effect": "Allow",
+            "Action": [
+              "s3:*"
+            ],
+            "Resource": [
+              "*"
+            ],
+            "Principal": "*"
+          }
+        ]
+      },
+      "RouteTableIds": [
+        {
+          "Ref": "TestRouteTable"
+        }
+      ],
+      "ServiceName": {
+        "Fn::Join": [
+          ".",
+          [
+            "com.amazonaws",
+            {
+              "Ref": "AWS::Region"
+            },
+            "s3"
+          ]
+        ]
+      },
+      "VpcId": {
+        "Ref": "TestVpc"
+      }
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/ecr-repository_test.rb

@@ -3,17 +3,17 @@ require 'abstract_unit'
 class EcrRepositoryTest < Minitest::Test
   def test_normal
     template = <<-EOS
-action = %w(
-  GetDownloadUrlForLayer
-  BatchGetImage
-  BatchCheckLayerAvailability
-  PutImage
-  InitiateLayerUpload
-  UploadLayerPart
-  CompleteLayerUpload
-)
+actions = [
+  'get download url for layer',
+  'batch get image',
+  'batch check layer availability',
+  'put image',
+  'initiate layer upload',
+  'upload layer part',
+  'complete layer upload',
+]
 account = { id: 1, name: "test" }
-_ecr_repository "test", { policy: { action: action, account: account } }
+_ecr_repository "test", policy: { actions: actions, principal: { account: account } }
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -21,7 +21,17 @@ _ecr_repository "test", { policy: { action: action, account: account } }
   "TestEcrRepository": {
     "Type": "AWS::ECR::Repository",
     "Properties": {
-      "RepositoryName": "test",
+      "RepositoryName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
       "RepositoryPolicyText": {
         "Version": "2012-10-17",
         "Statement": [
@@ -44,6 +54,48 @@ _ecr_repository "test", { policy: { action: action, account: account } }
       }
     }
   }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+action = 'get download url for layer'
+account = { id: 1, name: "test" }
+_ecr_repository "test", { policy: { action: action, principal: { account: account } } }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestEcrRepository": {
+    "Type": "AWS::ECR::Repository",
+    "Properties": {
+      "RepositoryName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
+      "RepositoryPolicyText": {
+        "Version": "2012-10-17",
+        "Statement": [
+          {
+            "Effect": "Allow",
+            "Action": [
+              "ecr:GetDownloadUrlForLayer"
+            ],
+            "Principal": {
+              "AWS": "arn:aws:iam::1:user/test"
+            }
+          }
+        ]
+      }
+    }
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/template/ecs-service_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class EcsServiceTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_ecs_service "test", ref_cluster: "test", ref_desired_count: "test", ref_task: "test"
+_ecs_service "test", ref_cluster: "test", ref_desired: "test", ref_task: "test"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -17,7 +17,18 @@ _ecs_service "test", ref_cluster: "test", ref_desired_count: "test", ref_task: "
       "DesiredCount": {
         "Ref": "TestEcsDesiredCount"
       },
-      "ServiceName": "test",
+      "LaunchType": "EC2",
+      "ServiceName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
       "TaskDefinition": {
         "Ref": "TestEcsTaskDefinition"
       }

data/test/template/ecs-task-definition_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class EcsTaskDefinitionTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_ecs_task_definition "test", container_definitions: [ { name: "test", image: "test" } ], volumes: [ { name: "test" } ]
+_ecs_task_definition "test", containers: [ { name: "test", image: "test", ports: [ { port: 80 } ] } ], volumes: [ "test": "/test" ]
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -13,21 +13,51 @@ _ecs_task_definition "test", container_definitions: [ { name: "test", image: "te
     "Properties": {
       "Volumes": [
         {
-          "Name": "test"
+          "Name": "test",
+          "Host": {
+            "SourcePath": "/test"
+          }
         }
       ],
+      "Family": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
+      "NetworkMode": "bridge",
       "ContainerDefinitions": [
         {
-          "Cpu": "10",
+          "Cpu": "1",
+          "DisableNetworking": "false",
           "Essential": "true",
+          "Hostname": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test"
+              ]
+            ]
+          },
           "Image": "test",
           "Memory": "300",
           "Name": "test",
           "PortMappings": [
             {
-              "ContainerPort": "80"
+              "ContainerPort": "80",
+              "Protocol": "tcp"
             }
-          ]
+          ],
+          "Privileged": "false",
+          "ReadonlyRootFilesystem": "false"
         }
       ]
     }
@@ -44,8 +74,8 @@ container1 = {
   entry_point: [ "/usr/sbin/apache2", "-D", "FOREGROUND" ],
   image: "amazon/amazon-ecs-sample",
   memory: 500,
-  mount_points: [ { source_volume: "my-vol", container_path: "/var/www/my-vol" } ],
-  port_mappings: [ { ref_container_port: "app", ref_host_port: "app" } ],
+  mounts: [ { source: "my-vol", path: "/var/www/my-vol" } ],
+  ports: [ { ref_port: "app", ref_host: "app" } ],
 }
 container2 = {
   name: "busybox",
@@ -56,14 +86,14 @@ container2 = {
   image: "busybox",
   memory: 500,
   port_mappings: nil,
-  volumes_from: [
+  volumes: [
     { ref_source: "app" }
   ],
 }
 volumes = [
-    { name: "my-vol", host: { source_path: "/var/lib/docker/vfs/dir/" } },
+    { "my-vol": "/var/lib/docker/vfs/dir/" },
 ]
-_ecs_task_definition "test", container_definitions: [ container1, container2 ], volumes: volumes
+_ecs_task_definition "test", containers: [ container1, container2 ], volumes: volumes
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -79,15 +109,41 @@ _ecs_task_definition "test", container_definitions: [ container1, container2 ],
           }
         }
       ],
+      "Family": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
+      "NetworkMode": "bridge",
       "ContainerDefinitions": [
         {
-          "Cpu": "10",
+          "Cpu": "1",
+          "DisableNetworking": "false",
           "EntryPoint": [
             "/usr/sbin/apache2",
             "-D",
             "FOREGROUND"
           ],
           "Essential": "true",
+          "Hostname": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                {
+                  "Ref": "App"
+                }
+              ]
+            ]
+          },
           "Image": "amazon/amazon-ecs-sample",
           "Memory": "500",
           "MountPoints": [
@@ -107,23 +163,40 @@ _ecs_task_definition "test", container_definitions: [ container1, container2 ],
               },
               "HostPort": {
                 "Ref": "AppHostPort"
-              }
+              },
+              "Protocol": "tcp"
             }
-          ]
+          ],
+          "Privileged": "false",
+          "ReadonlyRootFilesystem": "false"
         },
         {
           "Command": [
             "/bin/sh -c \\"while true; do /bin/date > /var/www/my-vol/date; sleep 1; done\\""
           ],
           "Cpu": "10",
+          "DisableNetworking": "false",
           "EntryPoint": [
             "sh",
             "-c"
           ],
           "Essential": "false",
+          "Hostname": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "busybox"
+              ]
+            ]
+          },
           "Image": "busybox",
           "Memory": "500",
           "Name": "busybox",
+          "Privileged": "false",
+          "ReadonlyRootFilesystem": "false",
           "VolumesFrom": [
             {
               "SourceContainer": {

data/test/template/elasticache-cache-cluster_test.rb

@@ -22,16 +22,14 @@ _elasticache_cache_cluster "test", ref_security_groups: "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },
-      "Engine": "redis",
-      "EngineVersion": "2.8.24",
+      "Engine": "#{ELASTICACHE_DEFAULT_ENGINE}",
+      "EngineVersion": "#{ELASTICACHE_DEFAULT_ENGINE_VERSION[:redis]}",
       "NumCacheNodes": "1",
-      "Port": "6379",
+      "Port": "#{PORT[:redis]}",
       "PreferredMaintenanceWindow": "Thu:20:15-Thu:21:15",
       "SnapshotRetentionLimit": "10",
       "SnapshotWindow": "21:15-22:15",

data/test/template/elasticache-replication-group_test.rb

@@ -19,7 +19,7 @@ _elasticache_replication_group "test", ref_security_groups: "test", ref_subnet:
         "Ref": "TestCacheSubnetGroup"
       },
       "Engine": "redis",
-      "EngineVersion": "2.8.24",
+      "EngineVersion": "2.8.6",
       "NumCacheClusters": "2",
       "Port": "6379",
       "PreferredCacheClusterAZs": {

data/test/template/elasticbeanstalk-application-version_test.rb

@@ -12,6 +12,7 @@ _elasticbeanstalk_application_version "test", application: "test", ref_s3_bucket
     "Type": "AWS::ElasticBeanstalk::ApplicationVersion",
     "Properties": {
       "ApplicationName": "test",
+      "Description": "test elasticbeanstalk application version description",
       "SourceBundle": {
         "S3Bucket": {
           "Fn::Join": [

data/test/template/elasticbeanstalk-application_test.rb

@@ -11,7 +11,8 @@ _elasticbeanstalk_application "test", application: "test"
   "TestElasticbeanstalkApplication": {
     "Type": "AWS::ElasticBeanstalk::Application",
     "Properties": {
-      "ApplicationName": "test"
+      "ApplicationName": "test",
+      "Description": "test elasticbeanstalk application description"
     }
   }
 }

data/test/template/elasticbeanstalk-configuration-template_test.rb

@@ -13,7 +13,8 @@ _elasticbeanstalk_configuration_template "test", ref_application: "test"
     "Properties": {
       "ApplicationName": {
         "Ref": "TestElasticbeanstalkApplication"
-      }
+      },
+      "Description": "test elasticbeanstalk configuration template description"
     }
   }
 }

data/test/template/elasticbeanstalk-template_test.rb

@@ -12,6 +12,7 @@ _elasticbeanstalk_configuration_template "test", application: "test", solution:
     "Type": "AWS::ElasticBeanstalk::ConfigurationTemplate",
     "Properties": {
       "ApplicationName": "test",
+      "Description": "test elasticbeanstalk configuration template description",
       "OptionSettings": [
         {
           "Namespace": "test",

data/test/template/elb-load-balancer_test.rb

@@ -38,9 +38,7 @@ _elb_load_balancer "test", ref_security_groups: [ "test" ], listeners: [ protoco
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },

data/test/template/emr-cluster_test.rb

@@ -34,9 +34,7 @@ _emr_cluster "test", job: { core: { name: "test" }, master: { name: "test" } }
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },
@@ -112,17 +110,7 @@ _emr_cluster "test", job: { core: core, master: master, termination: true }, clu
       "Tags": [
         {
           "Key": "Name",
-          "Value": {
-            "Fn::Join": [
-              "-",
-              [
-                {
-                  "Ref": "Service"
-                },
-                "test"
-              ]
-            ]
-          }
+          "Value": "TestCluster"
         },
         {
           "Key": "Service",

data/test/template/emr-instance-group-config_test.rb

@@ -25,9 +25,7 @@ _emr_instance_group_config "test", ref_cluster: "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       }
@@ -40,7 +38,7 @@ _emr_instance_group_config "test", ref_cluster: "test"
 
   def test_aws
     template = <<-EOS
-_emr_instance_group_config "test", ref_cluster: "cluster", instance_count: 2, instance_type: "m3.xlarge", instance_role: "TASK", config_name: "cfnTask2"
+_emr_instance_group_config "test", ref_cluster: "cluster", instance_count: 2, instance_type: "m3.xlarge", instance_role: "TASK", config: "cfnTask2"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS

data/test/template/emr-security-configuration_test.rb

@@ -0,0 +1,34 @@
+require 'abstract_unit'
+
+class EmrSecurityConfigurationTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_emr_security_configuration "test", configuration: { test: "test1" }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestEmrSecurityConfiguration": {
+    "Type": "AWS::EMR::SecurityConfiguration",
+    "Properties": {
+      "Name": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
+      "SecurityConfiguration": {
+        "test": "test1"
+      }
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/emr-step_test.rb

@@ -25,9 +25,7 @@ _emr_step "test", ref_cluster: "test", jar: "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       }
@@ -67,9 +65,7 @@ _emr_step "test", ref_cluster: "test", jar: "s3://emr-cfn-test/hadoop-mapreduce-
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       }