kumogata-template 0.0.35 → 0.0.36

data/test/template/events-rule_test.rb

@@ -11,6 +11,7 @@ _events_rule "test"
   "TestEventsRule": {
     "Type": "AWS::Events::Rule",
     "Properties": {
+      "Description": "test events rule description",
       "Name": {
         "Fn::Join": [
           "-",
@@ -18,12 +19,11 @@ _events_rule "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },
+      "ScheduleExpression": "rate(5 minute)",
       "State": "ENABLED"
     }
   }

data/test/template/iam-group_test.rb

@@ -11,7 +11,17 @@ _iam_group "test"
   "TestGroup": {
     "Type": "AWS::IAM::Group",
     "Properties": {
-      "GroupName": "test",
+      "GroupName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
       "Path": "/"
     }
   }

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

@@ -15,7 +15,17 @@ _iam_instance_profile "test", roles: [ "test" ]
       "Roles": [
         "test"
       ],
-      "InstanceProfileName": "test"
+      "InstanceProfileName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      }
     }
   }
 }

data/test/template/iam-managed-policy_test.rb

@@ -11,6 +11,7 @@ _iam_managed_policy "test", policy_document: [ { service: "s3" } ]
   "TestManagedPolicy": {
     "Type": "AWS::IAM::ManagedPolicy",
     "Properties": {
+      "Description": "test managed policy description",
       "Path": "/",
       "PolicyDocument": {
         "Version": "2012-10-17",

data/test/template/iam-policy_test.rb

@@ -32,9 +32,7 @@ _iam_policy "test", user: "test", ref_roles: "test", policy_document: [ { servic
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },

data/test/template/iam-role_test.rb

@@ -18,7 +18,7 @@ _iam_role "test", user: "test", service: "s3"
             "Effect": "Allow",
             "Principal": {
               "Service": [
-                "s3.amazonaws.com"
+                "s3.#{DOMAIN}"
               ]
             },
             "Action": [
@@ -28,7 +28,17 @@ _iam_role "test", user: "test", service: "s3"
         ]
       },
       "Path": "/",
-      "RoleName": "test"
+      "RoleName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      }
     }
   }
 }

data/test/template/iam-user_test.rb

@@ -12,7 +12,17 @@ _iam_user "test"
     "Type": "AWS::IAM::User",
     "Properties": {
       "Path": "/",
-      "UserName": "test"
+      "UserName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      }
     }
   }
 }
@@ -53,22 +63,6 @@ _iam_user "test", ref_user: "test"
       }
     }
   }
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-
-    template = <<-EOS
-_iam_user "test", user: false
-    EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "TestUser": {
-    "Type": "AWS::IAM::User",
-    "Properties": {
-      "Path": "/"
-    }
-  }
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/template/kinesis-firehorse-delivery-stream_test.rb

@@ -0,0 +1,68 @@
+require 'abstract_unit'
+
+class KinesisFirehoseDeliverySystemTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_kinesis_firehose_delivery_stream "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestKinesisFirehoseDeliveryStream": {
+    "Type": "AWS::KinesisFirehose::DeliveryStream",
+    "Properties": {
+      "DeliveryStreamName": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
+      "DeliveryStreamType": "DirectPut"
+    }
+  }
+}
+EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  # FIXME
+  def test_kinesis_stream
+    template = <<-EOS
+_kinesis_firehose_delivery_stream "test",
+                                  stream: "kinesis",
+                                  type: "kinesis", kinesis: { ref_stream: "test", ref_role: "test" }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestKinesisFirehoseDeliveryStream": {
+    "Type": "AWS::KinesisFirehose::DeliveryStream",
+    "Properties": {
+      "DeliveryStreamName": "kinesis",
+      "DeliveryStreamType": "KinesisStreamAsSource",
+      "KinesisStreamSourceConfiguration": {
+        "KinesisStreamARN": {
+          "Fn::GetAtt": [
+            "TestKinesisStream",
+            "Arn"
+          ]
+        },
+        "RoleARN": {
+          "Fn::GetAtt": [
+            "TestRole",
+            "Arn"
+          ]
+        }
+      }
+    }
+  }
+}
+EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/kinesis-stream_test.rb

@@ -0,0 +1,61 @@
+require 'abstract_unit'
+
+class KinesisStreamTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_kinesis_stream "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestKinesisStream": {
+    "Type": "AWS::Kinesis::Stream",
+    "Properties": {
+      "Name": {
+        "Fn::Join": [
+          "-",
+          [
+            {
+              "Ref": "Service"
+            },
+            "test"
+          ]
+        ]
+      },
+      "RetentionPeriodHours": "24",
+      "ShardCount": "1",
+      "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/kms-key_test.rb

@@ -11,6 +11,7 @@ _kms_key "test", { policy: [ { service: "s3" } ] }
   "TestKmsKey": {
     "Type": "AWS::KMS::Key",
     "Properties": {
+      "Description": "test kms key description",
       "Enabled": "true",
       "EnableKeyRotation": "false",
       "KeyPolicy": {

data/test/template/lambda-alias_test.rb

@@ -12,6 +12,7 @@ _lambda_alias "test", ref_function_name: "test", ref_function_version: "test"
   "TestLambdaAlias": {
     "Type": "AWS::Lambda::Alias",
     "Properties": {
+      "Description": "test lambda alias description",
       "FunctionName": {
         "Fn::GetAtt": [
           "TestLambdaFunction",
@@ -31,9 +32,7 @@ _lambda_alias "test", ref_function_name: "test", ref_function_version: "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       }

data/test/template/lambda-event-source-mapping_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class LambdaEventSourceMappingTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_lambda_event_source_mapping "test", ref_function_name: "test", ref_event_source: "test", event_source_prefix: "test"
+_lambda_event_source_mapping "test", ref_function: "test", ref_event: "test", event_prefix: "test"
 
     EOS
     act_template = run_client_as_json(template)

data/test/template/lambda-function_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class LambdaFunctionTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_lambda_function "test", code: { s3_bucket: "test", s3_key: "test" }, function_name: "test", ref_role: "test"
+_lambda_function "test", runtime: 'node6', code: { s3_bucket: "test", s3_key: "test" }, function: "test", ref_role: "test"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -15,8 +15,9 @@ _lambda_function "test", code: { s3_bucket: "test", s3_key: "test" }, function_n
         "S3Bucket": "test",
         "S3Key": "test"
       },
+      "Description": "test lambda function description",
       "FunctionName": "test",
-      "Handler": "test.handler",
+      "Handler": "lambda.handler",
       "MemorySize": "128",
       "Role": {
         "Fn::GetAtt": [
@@ -24,22 +25,12 @@ _lambda_function "test", code: { s3_bucket: "test", s3_key: "test" }, function_n
           "Arn"
         ]
       },
-      "Runtime": "nodejs",
-      "Timeout": "3",
+      "Runtime": "nodejs6.10",
+      "Timeout": "300",
       "Tags": [
         {
           "Key": "Name",
-          "Value": {
-            "Fn::Join": [
-              "-",
-              [
-                {
-                  "Ref": "Service"
-                },
-                "test"
-              ]
-            ]
-          }
+          "Value": "test"
         },
         {
           "Key": "Service",
@@ -54,14 +45,17 @@ _lambda_function "test", code: { s3_bucket: "test", s3_key: "test" }, function_n
           }
         }
       ]
-    }
+    },
+    "DependsOn": [
+      "TestRole"
+    ]
   }
 }
     EOS
     assert_equal exp_template.chomp, act_template
 
     template = <<-EOS
-_lambda_function "test", code: { zip_file: "test/data/lambda_function.py" }, function_name: "test", ref_role: "test", runtime: "python2.7"
+_lambda_function "test", code: { zip_file: "test/data/lambda_function.py" }, function: "test", ref_role: "test", runtime: "python2"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -72,7 +66,7 @@ _lambda_function "test", code: { zip_file: "test/data/lambda_function.py" }, fun
       "Code": {
         "ZipFile": {
           "Fn::Join": [
-            "\\\\n",
+            "\\n",
             [
               "import boto3",
               "",
@@ -82,8 +76,9 @@ _lambda_function "test", code: { zip_file: "test/data/lambda_function.py" }, fun
           ]
         }
       },
+      "Description": "test lambda function description",
       "FunctionName": "test",
-      "Handler": "test.lambda_handler",
+      "Handler": "lambda.handler",
       "MemorySize": "128",
       "Role": {
         "Fn::GetAtt": [
@@ -92,21 +87,11 @@ _lambda_function "test", code: { zip_file: "test/data/lambda_function.py" }, fun
         ]
       },
       "Runtime": "python2.7",
-      "Timeout": "3",
+      "Timeout": "300",
       "Tags": [
         {
           "Key": "Name",
-          "Value": {
-            "Fn::Join": [
-              "-",
-              [
-                {
-                  "Ref": "Service"
-                },
-                "test"
-              ]
-            ]
-          }
+          "Value": "test"
         },
         {
           "Key": "Service",
@@ -121,7 +106,10 @@ _lambda_function "test", code: { zip_file: "test/data/lambda_function.py" }, fun
           }
         }
       ]
-    }
+    },
+    "DependsOn": [
+      "TestRole"
+    ]
   }
 }
     EOS

data/test/template/lambda-permission_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class LambdaPermissionTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_lambda_permission "test", action: "test", ref_function_name: "test", ref_source_arn: "test"
+_lambda_permission "test", principal: 'sns', ref_function: "test", ref_source_arn: "test"
 
     EOS
     act_template = run_client_as_json(template)
@@ -12,18 +12,21 @@ _lambda_permission "test", action: "test", ref_function_name: "test", ref_source
   "TestLambdaPermission": {
     "Type": "AWS::Lambda::Permission",
     "Properties": {
-      "Action": "test",
+      "Action": "lambda:InvokeFunction",
       "FunctionName": {
         "Fn::GetAtt": [
           "TestLambdaFunction",
           "Arn"
         ]
       },
-      "Principal": "sns.amazonaws.com",
+      "Principal": "sns.#{DOMAIN}",
       "SourceArn": {
         "Ref": "TestTopic"
       }
-    }
+    },
+    "DependsOn": [
+      "TestLambdaFunction"
+    ]
   }
 }
     EOS

data/test/template/lambda-version_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class LambdaVersionTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_lambda_version "test", ref_function_name: "test", ref_source_arn: "test"
+_lambda_version "test", ref_function: "test", ref_source_arn: "test"
 
     EOS
     act_template = run_client_as_json(template)
@@ -18,7 +18,10 @@ _lambda_version "test", ref_function_name: "test", ref_source_arn: "test"
           "Arn"
         ]
       }
-    }
+    },
+    "DependsOn": [
+      "TestLambdaFunction"
+    ]
   }
 }
     EOS

data/test/template/logs-log-group_test.rb

@@ -18,9 +18,7 @@ _logs_log_group "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },

data/test/template/logs-log-stream_test.rb

@@ -18,9 +18,7 @@ _logs_log_stream "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },
@@ -31,9 +29,7 @@ _logs_log_stream "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       }

data/test/template/logs-metric-filter_test.rb

@@ -19,9 +19,7 @@ _logs_metric_filter "test", { pattern: "test", transformations: [ { name: "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },

data/test/template/logs-subscription-filter_test.rb

@@ -20,9 +20,7 @@ _logs_subscription_filter "test", dest: "test", pattern: "test", role: "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },

data/test/template/mappings-ec2_test.rb

@@ -24,12 +24,18 @@ _mappings_ec2 "test"
 #{archs.chomp}
   },
   "AWSRegionArch2AMIAmazonLinuxOfficial": {
+#{images.chomp}
+  },
+  "AWSRegionArch2AMIAmazonLinux2Official": {
 #{images.chomp}
   },
   "AWSRegionArch2AMICentos7Official": {
 #{images.chomp}
   },
   "AWSRegionArch2AMIUbuntu16Official": {
+#{images.chomp}
+  },
+  "AWSRegionArch2AMIEcsOfficial": {
 #{images.chomp}
   }
 }
@@ -40,10 +46,11 @@ _mappings_ec2 "test"
   private
   def generate_image_values
     values = ''
-    AWS_REGION.each_with_index do |v, i|
-      region, location = v
+    AWS_REGION.each_with_index do |region, i|
+      key, value = region
+      next if key =~ /local/
       values += <<-EOS
-    "#{location}": {
+    "#{value}": {
       "HVM64": "ami-*"
     }#{i == (AWS_REGION.size - 1) ? '' : ','}
     EOS

data/test/template/output-domain-name_test.rb

@@ -0,0 +1,30 @@
+require 'abstract_unit'
+
+class OutputDomainNameTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_output_domain_name "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestDomainNameDomain": {
+    "Description": "description of TestDomainNameDomain",
+    "Value": {
+      "Ref": "TestDomainName"
+    }
+  },
+  "TestDomainNameDistribution": {
+    "Description": "description of TestDomainNameDistribution",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestDomainName",
+        "DistributionDomainName"
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/output-name_test.rb

@@ -13,6 +13,15 @@ _output_name "test"
     "Value": {
       "Ref": "Test"
     }
+  },
+  "TestNameName": {
+    "Description": "description of TestNameName",
+    "Value": {
+      "Fn::GetAtt": [
+        "Test",
+        "Name"
+      ]
+    }
   }
 }
     EOS

data/test/template/{output-rds_test.rb → output-rds-instance_test.rb}

@@ -1,9 +1,9 @@
 require 'abstract_unit'
 
-class OutputRdsrTest < Minitest::Test
+class OutputRdsInstanceTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_output_rds "test"
+_output_rds_instance "test"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS

data/test/template/output-rest-api_test.rb

@@ -0,0 +1,30 @@
+require 'abstract_unit'
+
+class OutputRestApiTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_output_rest_api "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestRestApi": {
+    "Description": "description of TestRestApi",
+    "Value": {
+      "Ref": "TestRestApi"
+    }
+  },
+  "TestRestApiRootResource": {
+    "Description": "description of TestRestApiRootResource",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestRestApi",
+        "RootResourceId"
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end