kumogata-template 0.0.35 → 0.0.36

data/test/cloudfront_test.rb

@@ -4,7 +4,7 @@ require 'kumogata/template/cloudfront'
 class CloudFrontTest < Minitest::Test
   def test_cloudfront_distribution_config
     template = <<-EOS
-Test _cloudfront_distribution_config({ origins: [{ domain: "test", id: "test", s3: {} }] })
+Test _cloudfront_distribution_config({ origins: [{ domain: "test", id: "test", s3: "test" }] })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -15,9 +15,19 @@ Test _cloudfront_distribution_config({ origins: [{ domain: "test", id: "test", s
     "HttpVersion": "http2",
     "Origins": [
       {
-        "DomainName": "test",
+        "DomainName": "test.s3.#{DOMAIN}",
         "Id": "test",
         "S3OriginConfig": {
+          "OriginAccessIdentity": {
+            "Fn::Join": [
+              "/",
+              [
+                "origin-access-identity",
+                "cloudfront",
+                "test"
+              ]
+            ]
+          }
         }
       }
     ]
@@ -35,9 +45,12 @@ Test _cloudfront_cache_behavior({ forwarded: {}, path: "test", target: "test", v
     exp_template = <<-EOS
 {
   "Test": {
+    "DefaultTTL": "86400",
     "ForwardedValues": {
       "QueryString": "false"
     },
+    "MaxTTL": "31536000",
+    "MinTTL": "0",
     "PathPattern": "test",
     "TargetOriginId": "test",
     "ViewerProtocolPolicy": "redirect-to-https"
@@ -86,6 +99,7 @@ Test _cloudfront_custom_error({})
     exp_template = <<-EOS
 {
   "Test": {
+    "ErrorCachingMinTTL": "300",
     "ErrorCode": "404",
     "ResponseCode": "404",
     "ResponsePagePath": "/404.html"
@@ -104,6 +118,7 @@ Test _cloudfront_custom_errors([ {} ])
 {
   "Test": [
     {
+      "ErrorCachingMinTTL": "300",
       "ErrorCode": "404",
       "ResponseCode": "404",
       "ResponsePagePath": "/404.html"
@@ -131,15 +146,25 @@ Test _cloudfront_logging({ bucket: "test" })
 
   def test_cloudfront_origin
     template = <<-EOS
-Test _cloudfront_origin({ domain: "test", id: "test", s3: {} })
+Test _cloudfront_origin({ domain: "test", id: "test", s3: 'test' })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": {
-    "DomainName": "test",
+    "DomainName": "test.s3.#{DOMAIN}",
     "Id": "test",
     "S3OriginConfig": {
+      "OriginAccessIdentity": {
+        "Fn::Join": [
+          "/",
+          [
+            "origin-access-identity",
+            "cloudfront",
+            "test"
+          ]
+        ]
+      }
     }
   }
 }
@@ -149,21 +174,21 @@ Test _cloudfront_origin({ domain: "test", id: "test", s3: {} })
 
   def test_cloudfront_origins
     template = <<-EOS
-Test _cloudfront_origins([ { domain: "test1", id: "test1", s3: {} },
-                           { domain: "test2", id: "test2", s3: {} } ])
+Test _cloudfront_origins([ { domain: "test1", id: "test1" },
+                           { domain: "test2", id: "test2" } ])
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": [
     {
-      "DomainName": "test1",
+      "DomainName": "test1.s3.#{DOMAIN}",
       "Id": "test1",
       "S3OriginConfig": {
       }
     },
     {
-      "DomainName": "test2",
+      "DomainName": "test2.s3.#{DOMAIN}",
       "Id": "test2",
       "S3OriginConfig": {
       }
@@ -174,20 +199,6 @@ Test _cloudfront_origins([ { domain: "test1", id: "test1", s3: {} },
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_cloudfront_custom_origin
-    template = <<-EOS
-Test _cloudfront_custom_origin({})
-    EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "Test": {
-  }
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-  end
-
   def test_cloudfront_s3_origin
     template = <<-EOS
 Test _cloudfront_s3_origin({})
@@ -200,37 +211,54 @@ Test _cloudfront_s3_origin({})
 }
     EOS
     assert_equal exp_template.chomp, act_template
-  end
 
-  def test_cloudfront_custom_origin
     template = <<-EOS
-Test _cloudfront_custom_origin({})
+Test _cloudfront_s3_origin({ ref_s3: 'test' })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": {
+    "OriginAccessIdentity": {
+      "Fn::Join": [
+        "/",
+        [
+          "origin-access-identity",
+          "cloudfront",
+          {
+            "Ref": "TestOriginAccessIdentity"
+          }
+        ]
+      ]
+    }
   }
 }
     EOS
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_cloudfront_s3_origin
+  def test_cloudfront_custom_origin
     template = <<-EOS
-Test _cloudfront_s3_origin({})
+Test _cloudfront_custom_origin({})
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": {
+    "HTTPPort": "80",
+    "HTTPSPort": "443",
+    "OriginKeepaliveTimeout": "5",
+    "OriginProtocolPolicy": "match-viewer",
+    "OriginReadTimeout": "30",
+    "OriginSSLProtocols": [
+      "TLSv1.1"
+    ]
   }
 }
     EOS
     assert_equal exp_template.chomp, act_template
   end
 
-
   def test_cloudfront_origin_headers
     template = <<-EOS
 Test _cloudfront_origin_headers({ name: "test", value: "test" })
@@ -256,6 +284,7 @@ Test _cloudfront_viewer_cert({ acm: "test" })
 {
   "Test": {
     "AcmCertificateArn": "test",
+    "MinimumProtocolVersion": "TLSv1.1_2016",
     "SslSupportMethod": "sni-only"
   }
 }

data/test/codedeploy_test.rb

@@ -18,6 +18,27 @@ Test _codedeploy_minimum(type: "fleet_percent", value: "75")
     assert_equal exp_template.chomp, act_template
   end
 
+  def test_codedeploy_alarm
+    template = <<-EOS
+Test _codedeploy_alarm(alarm: { alarms: [ "test" ] })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Alarms": [
+      {
+        "Name": "test"
+      }
+    ],
+    "Enabled": "true",
+    "IgnorePollAlarmFailure": "false"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
   def test_codedeploy_deployment
     template = <<-EOS
 Test _codedeploy_deployment(description: "test", revision: { s3: { bucket: "test", key: "test", version: "test" } })

data/test/datapipeline_test.rb

@@ -113,28 +113,6 @@ Test _datapipeline_pipeline_object_fields(fields: fields)
       "StringValue": "test1"
     }
   ]
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-  end
-
-  def test_datapipeline_pipeline_tags
-    template = <<-EOS
-Test _datapipeline_pipeline_tags(tags: { test: "test", test1: "test1" })
-    EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "Test": [
-    {
-      "Key": "test",
-      "Value": "test"
-    },
-    {
-      "Key": "test1",
-      "Value": "test1"
-    }
-  ]
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/ec2_test.rb

@@ -121,6 +121,7 @@ Test _ec2_security_group_egress_rules("egress", args)
   "Test": [
     {
       "CidrIp": "0.0.0.0/0",
+      "Description": "egress rule description",
       "FromPort": "80",
       "IpProtocol": "tcp",
       "ToPort": "80"
@@ -140,6 +141,7 @@ Test _ec2_security_group_egress_rules("egress", args)
   "Test": [
     {
       "CidrIp": "0.0.0.0/0",
+      "Description": "egress rule description",
       "FromPort": "80",
       "IpProtocol": "tcp",
       "ToPort": "80"
@@ -159,6 +161,7 @@ Test _ec2_security_group_egress_rule(to: 80)
 {
   "Test": {
     "CidrIp": "0.0.0.0/0",
+    "Description": "egress rule description",
     "FromPort": "80",
     "IpProtocol": "tcp",
     "ToPort": "80"
@@ -179,6 +182,7 @@ Test _ec2_security_group_ingress_rules("ingress", args)
   "Test": [
     {
       "CidrIp": "0.0.0.0/0",
+      "Description": "inbound rule description",
       "FromPort": "80",
       "IpProtocol": "tcp",
       "ToPort": "80"
@@ -198,12 +202,14 @@ Test _ec2_security_group_ingress_rules("ingress", args)
   "Test": [
     {
       "CidrIp": "0.0.0.0/0",
+      "Description": "inbound rule description",
       "FromPort": "22",
       "IpProtocol": "tcp",
       "ToPort": "22"
     },
     {
       "CidrIp": "0.0.0.0/0",
+      "Description": "inbound rule description",
       "FromPort": "80",
       "IpProtocol": "tcp",
       "ToPort": "80"
@@ -223,6 +229,7 @@ Test _ec2_security_group_ingress_rule(from: 80)
 {
   "Test": {
     "CidrIp": "0.0.0.0/0",
+    "Description": "inbound rule description",
     "FromPort": "80",
     "IpProtocol": "tcp",
     "ToPort": "80"
@@ -240,7 +247,7 @@ Test _ec2_block_device(ref_size: "test")
     exp_template = <<-EOS
 {
   "Test": {
-    "DeviceName": "/dev/sda1",
+    "DeviceName": "/dev/sdb",
     "Ebs": {
       "DeleteOnTermination": "true",
       "VolumeSize": {
@@ -276,14 +283,14 @@ Test _ec2_network_interface_embedded(ref_subnet: "test")
 
   def test_ec2_image
     template = <<-EOS
-Test _ec2_image("test", {})
+Test _ec2_image({ image: 'test', instance_type: 'test' })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": {
     "Fn::FindInMap": [
-      "AWSRegionArch2AMIAmazonLinuxOfficial",
+      "AWSRegionArch2AMITest",
       {
         "Ref": "AWS::Region"
       },
@@ -301,59 +308,12 @@ Test _ec2_image("test", {})
     assert_equal exp_template.chomp, act_template
 
     template = <<-EOS
-Test _ec2_image("test", { image_id: "test" })
+Test _ec2_image({ image_id: "test" })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": "test"
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-
-    template = <<-EOS
-Test _ec2_image("test", { image_id: false })
-    EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "Test": {
-    "Fn::FindInMap": [
-      "AWSRegionArch2AMIAmazonLinuxOfficial",
-      {
-        "Ref": "AWS::Region"
-      },
-      {
-        "Fn::FindInMap": [
-          "AWSInstanceType2Arch",
-          "test",
-          "Arch"
-        ]
-      }
-    ]
-  }
-
-    template = <<-EOS
-Test _ec2_image("test", { image_id: nil })
-    EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "Test": {
-    "Fn::FindInMap": [
-      "AWSRegionArch2AMIAmazonLinuxOfficial",
-      {
-        "Ref": "AWS::Region"
-      },
-      {
-        "Fn::FindInMap": [
-          "AWSInstanceType2Arch",
-          "test",
-          "Arch"
-        ]
-      }
-    ]
-  }
 }
     EOS
     assert_equal exp_template.chomp, act_template
@@ -434,7 +394,7 @@ Test _ec2_spot_fleet_launches({ block_devices: [ { ref_size: "test" } ], iam: "t
   "Test": {
     "BlockDeviceMappings": [
       {
-        "DeviceName": "/dev/sda1",
+        "DeviceName": "/dev/sdb",
         "Ebs": {
           "DeleteOnTermination": "true",
           "VolumeSize": {

data/test/ecs_test.rb

@@ -4,7 +4,7 @@ require 'kumogata/template/ecs'
 class EcsTest < Minitest::Test
   def test_ecs_load_balancers
     template = <<-EOS
-Test _ecs_load_balancers(load_balancers: [ { container_name: "test", container_port: 80, lb_name: "test" } ])
+Test _ecs_load_balancers(load_balancers: [ { name: "test", port: 80, lb_name: "test" } ])
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -21,25 +21,40 @@ Test _ecs_load_balancers(load_balancers: [ { container_name: "test", container_p
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_ecs_container_definitions
+  def test_ecs_container
     template = <<-EOS
-Test _ecs_container_definitions(container_definitions: [ { name: "test", image: "test" } ])
+Test _ecs_containers(containers: [ { name: "test", image: "test", port_mappings: [ { port: 80 } ] } ])
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": [
     {
-      "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"
     }
   ]
 }
@@ -49,7 +64,7 @@ Test _ecs_container_definitions(container_definitions: [ { name: "test", image:
 
   def test_ecs_mount_points
     template = <<-EOS
-Test _ecs_mount_points(mount_points: [ { container_path: "/", source_volume: "/" } ])
+Test _ecs_mount_points(mount_points: [ { path: "/", source: "/" } ])
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -68,14 +83,15 @@ Test _ecs_mount_points(mount_points: [ { container_path: "/", source_volume: "/"
 
   def test_ecs_port_mappings
     template = <<-EOS
-Test _ecs_port_mappings(port_mappings: [ { container_port: 80 } ])
+Test _ecs_port_mappings(port_mappings: [ { port: 80 } ])
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": [
     {
-      "ContainerPort": "80"
+      "ContainerPort": "80",
+      "Protocol": "tcp"
     }
   ]
 }
@@ -103,31 +119,19 @@ Test _ecs_volumes_from(volumes_from: [ { source: "test" } ])
 
   def test_ecs_volumes
     template = <<-EOS
-Test _ecs_volumes(volumes: [ { name: "test" } ])
+Test _ecs_volumes(volumes: [ { test: "test1" } ])
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": [
     {
-      "Name": "test"
+      "Name": "test",
+      "Host": {
+        "SourcePath": "test1"
+      }
     }
   ]
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-  end
-
-  def test_ecs_volumes_host
-    template = <<-EOS
-Test _ecs_volumes_host(source_path: "test")
-    EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "Test": {
-    "SourcePath": "test"
-  }
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/emr_test.rb

@@ -134,7 +134,7 @@ Test _emr_ebs(ebs: [ { size: "test" } ])
     exp_template = <<-EOS
 {
   "Test": {
-    "EbsBlockDeviceConfigs": [
+    "EbsBlockDeviceConfig": [
       {
         "VolumeSpecification": {
           "SizeInGB": "test",
@@ -184,7 +184,7 @@ Test _emr_ebs_volume({ size: "test" })
 
   def test_emr_job_flow
     template = <<-EOS
-Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test", ebs: [ { size: 42, type: "gp2" } ] } })
+Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test" } })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -197,16 +197,6 @@ Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test", ebs: [
       "Name": "test"
     },
     "MasterInstanceGroup": {
-      "EbsConfiguration": {
-        "EbsBlockDeviceConfigs": [
-          {
-            "VolumeSpecification": {
-              "SizeInGB": "42",
-              "VolumeType": "gp2"
-            }
-          }
-        ]
-      },
       "InstanceCount": "1",
       "InstanceType": "c4.large",
       "Market": "ON_DEMAND",
@@ -214,6 +204,64 @@ Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test", ebs: [
     },
     "TerminationProtected": "false"
   }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _emr_job_flow(job: { core: { fleet: { name: "test", configs: [ { bid: 1 } ], on_demand: 1, spot: 2 } },
+                          master: { fleet: { name: "test", configs: [ { bid: 1 } ], on_demand: 1, spot: 2  } } } )
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "CoreInstanceFleet": {
+      "InstanceTypeConfigs": [
+        {
+          "BidPrice": "1",
+          "InstanceType": "c4.large",
+          "WeightedCapacity": "1"
+        }
+      ],
+      "Name": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
+      "TargetOnDemandCapacity": "1",
+      "TargetSpotCapacity": "2"
+    },
+    "MasterInstanceFleet": {
+      "InstanceTypeConfigs": [
+        {
+          "BidPrice": "1",
+          "InstanceType": "c4.large",
+          "WeightedCapacity": "1"
+        }
+      ],
+      "Name": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
+      "TargetOnDemandCapacity": "1",
+      "TargetSpotCapacity": "2"
+    },
+    "TerminationProtected": "false"
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template
@@ -252,19 +300,52 @@ Test _emr_hadoop_jar_step_config(jar: "test")
     assert_equal exp_template.chomp, act_template
   end
 
-  def test_emr_step_properties
+  def test_emr_instance_autoscaling
     template = <<-EOS
-Test _emr_step_properties(step_properties: [ { key: "test", value: "test" } ])
+autoscaling = {
+  max: 1,
+  min: 0,
+  rules: [
+    { rule: "test1", type: "change", cool: 60, scaling: 1, operator: ">=", definition: "test2", threshold: 60, unit: "sec" },
+  ],
+}
+Test _emr_instance_autoscaling({ autoscaling: autoscaling })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
-  "Test": [
-    {
-      "Key": "test",
-      "Value": "test"
-    }
-  ]
+  "Test": {
+    "Constraints": {
+      "MaxCapacity": "1",
+      "MinCapacity": "0"
+    },
+    "Rules": [
+      {
+        "Action": {
+          "Market": "ON_DEMAND",
+          "SimpleScalingPolicyConfiguration": {
+            "AdjustmentType": "CHANGE_IN_CAPACITY",
+            "CoolDown": "60",
+            "ScalingAdjustment": "1"
+          }
+        },
+        "Description": "test1 instance autoscaling rules description",
+        "Name": "test1",
+        "Trigger": {
+          "CloudWatchAlarmDefinition": {
+            "ComparisonOperator": "GREATER_THAN_OR_EQUAL",
+            "EvaluationPeriods": "1",
+            "MetricName": "test2",
+            "Namespace": "AWS/ElasticMapReduce",
+            "Period": "300",
+            "Statistic": "AVERAGE",
+            "Threshold": "60",
+            "Unit": "Seconds"
+          }
+        }
+      }
+    ]
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template