kumogata-template 0.0.29 → 0.0.30

data/test/helper_test.rb

@@ -2,6 +2,21 @@ require 'abstract_unit'
 require 'kumogata/template/helper'
 
 class HelperTest < Minitest::Test
+  def test_region
+    template = <<-EOS
+Test _region()
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Ref": "AWS::Region"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
   def test_resource_name
     assert_equal _resource_name("test"), "Test"
     assert_equal _resource_name("test", "Resource"), "TestResource"
@@ -55,6 +70,17 @@ EOS
     assert_nil _valid_numbers(nil, 0, 1)
   end
 
+  def test_real_name
+    assert_equal _real_name("test test"), "test-test"
+  end
+
+  def test_ref_key
+    assert_equal _ref_key?("test", { test: "test" }), true
+    assert_equal _ref_key?("test", { import_test: "test" }), true
+    assert_equal _ref_key?("test", { ref_test: "test" }), true
+    assert_equal _ref_key?("test1", { test2: "test" }), false
+  end
+
   def test_ref_string
     template = <<-EOS
 Test _ref_string("test", {})
@@ -74,6 +100,58 @@ Test _ref_string("test", test: "test")
     exp_template = <<-EOS
 {
   "Test": "test"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _ref_string("test", import_test: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::ImportValue": {
+      "Fn::Sub": "test"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_ref_string_default
+    template = <<-EOS
+Test _ref_string_default("test", { test: "test" }, '', "default")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "test"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _ref_string_default("test", { ref_test: "test" }, '', "default")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Ref": "Test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _ref_string_default("test", {}, '', "default")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "default"
 }
     EOS
     assert_equal exp_template.chomp, act_template
@@ -129,6 +207,28 @@ Tests _ref_array("tests", name: "tests", ref_tests: "test1")
       "Ref": "Test1"
     }
   ]
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _ref_array("tests", import_tests: [ "test1", "test2" ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": [
+    {
+      "Fn::ImportValue": {
+        "Fn::Sub": "test1"
+      }
+    },
+    {
+      "Fn::ImportValue": {
+        "Fn::Sub": "test2"
+      }
+    }
+  ]
 }
     EOS
     assert_equal exp_template.chomp, act_template
@@ -233,6 +333,21 @@ Test _ref_name("test", ref_raw_test: "test")
     EOS
     assert_equal exp_template.chomp, act_template
 
+    template = <<-EOS
+Test _ref_name("test", import_test: "test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::ImportValue": {
+      "Fn::Sub": "test"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
     template = <<-EOS
 Test _ref_name("test", {})
     EOS
@@ -272,6 +387,21 @@ Test _ref_name_default("test", { name: "test1" })
     # _ref_name_default(name, args, ref_name = '')
   end
 
+  def test_azs
+    template = <<-EOS
+Test _azs("test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::GetAZs": "test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
   def test_attr_string
     template = <<-EOS
 Test _attr_string("test", "test1")
@@ -290,6 +420,183 @@ Test _attr_string("test", "test1")
     assert_equal exp_template.chomp, act_template
   end
 
+  def test_and
+    template = <<-EOS
+Test _and([ "test" ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::And": [
+      "test"
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _and([ _equals("test1", "test2"), _condition("test3") ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::And": [
+      {
+        "Fn::Equals": [
+          "test1",
+          "test2"
+        ]
+      },
+      {
+        "Condition": "test3"
+      }
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_equals
+    template = <<-EOS
+Test _equals("test1", "test2")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Equals": [
+      "test1",
+      "test2"
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_if
+    template = <<-EOS
+Test _if("test", "test1", "test2")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::If": [
+      "test",
+      "test1",
+      "test2"
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _if("test", _ref("Test1"), _ref("Test2"))
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::If": [
+      "test",
+      {
+        "Ref": "Test1"
+      },
+      {
+        "Ref": "Test2"
+      }
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_not
+    template = <<-EOS
+Test _not([ "test" ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Not": [
+      "test"
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_or
+    template = <<-EOS
+Test _or([ "test" ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Or": [
+      "test"
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_condition
+    template = <<-EOS
+Test _condition("test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Condition": "test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_base64
+    template = <<-EOS
+Test _base64("test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Base64": "test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_base64_shell
+    template = <<-EOS
+Test _base64_shell("test shell")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Base64": "#!/bin/bash\\ntest shell"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
   def test_find_in_map
     template = <<-EOS
 Test _find_in_map("Test", "test1", "test2")
@@ -330,6 +637,124 @@ Test _select(1, %w( test1 test2 ))
     assert_equal exp_template.chomp, act_template
   end
 
+  def test_split
+    template = <<-EOS
+Test _split("test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Split": [
+      ",",
+      "test"
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_sub
+    template = <<-EOS
+Test _sub("test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Sub": "test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_ref
+    template = <<-EOS
+Test _ref("test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Ref": "test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_export_string
+    assert_equal _export_string({ name: "test" }, "test"), ""
+    assert_equal _export_string({ name: "test", export: true }, "test"), "test-test"
+  end
+
+  def test_export
+    template = <<-EOS
+Test _export( { name: "test", export: "export" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Name": {
+      "Fn::Sub": "${AWS::StackName}-export"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _export({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": ""
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_join
+    template = <<-EOS
+Test _join({ test: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::Join": [
+      ",",
+      {
+        "test": "test"
+      }
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_import
+    template = <<-EOS
+Test _import("test")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Fn::ImportValue": {
+      "Fn::Sub": "test"
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
   def test_tag
     template = <<-EOS
 Test _tag(key: "test", value: "test")
@@ -709,6 +1134,12 @@ Test _availability_zones({})
     assert_equal _timestamp_utc_from_string("2016-04-01 00:00"), "2016-03-31T15:00:00Z"
   end
 
+  def test_timestamp_utc_duration
+    assert_equal _timestamp_utc_duration(1), "PT1M"
+    assert_equal _timestamp_utc_duration(1, 2), "PT2H1M"
+    assert_equal _timestamp_utc_duration(1, 2, 3), "PT2H1M3S"
+  end
+
   def test_maintenance_window
     start_time = Time.local(2016, 4, 1, 3, 30)
     end_time = start_time + (60 * 60)

data/test/template/autoscaling-launch-configuration_test.rb

@@ -33,10 +33,7 @@ _autoscaling_launch_configuration "test", image: "test", ref_instance_type: "tes
       "InstanceType": {
         "Ref": "TestInstanceType"
       },
-      "KeyName": "test",
-      "UserData": {
-        "Fn::Base64": "#!/bin/bash\\n\\n"
-      }
+      "KeyName": "test"
     }
   }
 }

data/test/template/ec2-instance_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class Ec2InstanceTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_ec2_instance "test", key_name: "test", ref_instance_type: "test", ref_iam_instance: "test"
+_ec2_instance "test", key_name: "test", ref_instance_type: "test", ref_iam_instance: "test", user_data: "test data"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -84,7 +84,7 @@ _ec2_instance "test", key_name: "test", ref_instance_type: "test", ref_iam_insta
       ],
       "Tenancy": "default",
       "UserData": {
-        "Fn::Base64": "#!/bin/bash\\n\\n"
+        "Fn::Base64": "#!/bin/bash\\ntest data"
       }
     }
   }

data/test/template/ec2-vpc_test.rb

@@ -11,7 +11,7 @@ _ec2_vpc "test"
   "TestVpc": {
     "Type": "AWS::EC2::VPC",
     "Properties": {
-      "CidrBlock": "191.168.1.0/16",
+      "CidrBlock": "10.1.1.0/28",
       "EnableDnsSupport": "true",
       "EnableDnsHostnames": "true",
       "InstanceTenancy": "default",
@@ -60,7 +60,7 @@ _ec2_vpc "test"
   "TestVpc": {
     "Type": "AWS::EC2::VPC",
     "Properties": {
-      "CidrBlock": "191.168.1.0/16",
+      "CidrBlock": "10.1.1.0/28",
       "EnableDnsSupport": "true",
       "EnableDnsHostnames": "true",
       "InstanceTenancy": "default",

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

@@ -11,6 +11,11 @@ _ecs_task_definition "test", container_definitions: [ { name: "test", image: "te
   "TestEcsTaskDefinition": {
     "Type": "AWS::ECS::TaskDefinition",
     "Properties": {
+      "Volumes": [
+        {
+          "Name": "test"
+        }
+      ],
       "ContainerDefinitions": [
         {
           "Cpu": "10",
@@ -24,11 +29,6 @@ _ecs_task_definition "test", container_definitions: [ { name: "test", image: "te
             }
           ]
         }
-      ],
-      "Volumes": [
-        {
-          "Name": "test"
-        }
       ]
     }
   }
@@ -71,6 +71,14 @@ _ecs_task_definition "test", container_definitions: [ container1, container2 ],
   "TestEcsTaskDefinition": {
     "Type": "AWS::ECS::TaskDefinition",
     "Properties": {
+      "Volumes": [
+        {
+          "Name": "my-vol",
+          "Host": {
+            "SourcePath": "/var/lib/docker/vfs/dir/"
+          }
+        }
+      ],
       "ContainerDefinitions": [
         {
           "Cpu": "10",
@@ -125,14 +133,6 @@ _ecs_task_definition "test", container_definitions: [ container1, container2 ],
             }
           ]
         }
-      ],
-      "Volumes": [
-        {
-          "Name": "my-vol",
-          "Host": {
-            "SourcePath": "/var/lib/docker/vfs/dir/"
-          }
-        }
       ]
     }
   }

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

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class ElasticbeanstalkApplicationVersionTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_elasticbeanstalk_application_version "test", application: "test", ref_s3_bucket: "test", s3_key: "test"
+_elasticbeanstalk_application_version "test", application: "test", ref_s3_bucket: "test", s3_key: "test.war"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -14,9 +14,19 @@ _elasticbeanstalk_application_version "test", application: "test", ref_s3_bucket
       "ApplicationName": "test",
       "SourceBundle": {
         "S3Bucket": {
-          "Ref": "TestBucket"
+          "Fn::Join": [
+            "-",
+            [
+              {
+                "Ref": "TestBucket"
+              },
+              {
+                "Ref": "AWS::Region"
+              }
+            ]
+          ]
         },
-        "S3Key": "test"
+        "S3Key": "test.war"
       }
     }
   }

data/test/template/elasticbeanstalk-template_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class ElasticbeanstalkTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_elasticbeanstalk_configuration_template "test", application: "test", solution: "test", option: [ { namespace: "test", option: "test", value: "test" } ], configuration: { application: "test", template: "test" }
+_elasticbeanstalk_configuration_template "test", application: "test", solution: "test", options: [ { name: "test", option: "test", value: "test" } ], configuration: { application: "test", template: "test" }
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS

data/test/template/iam-instance-profile_test.rb

@@ -17,6 +17,26 @@ _iam_instance_profile "test", user: "test", roles: [ "test" ]
       ]
     }
   }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+_iam_instance_profile "test", user: "test", roles: [ "test" ], profile_name: "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestInstanceProfile": {
+    "Type": "AWS::IAM::InstanceProfile",
+    "Properties": {
+      "Path": "/",
+      "Roles": [
+        "test"
+      ],
+      "InstanceProfileName": "test"
+    }
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template