kumogata-template 0.0.35 → 0.0.36

data/test/template/output-s3_test.rb

@@ -8,6 +8,15 @@ _output_s3 "test", domain: true
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
+  "TestBucketS3Arn": {
+    "Description": "description of TestBucketS3Arn",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestBucket",
+        "Arn"
+      ]
+    }
+  },
   "TestBucketS3DomainName": {
     "Description": "description of TestBucketS3DomainName",
     "Value": {

data/test/template/output-stage_test.rb

@@ -0,0 +1,43 @@
+require 'abstract_unit'
+
+class OutputStageTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_output_stage "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestStage": {
+    "Description": "description of TestStage",
+    "Value": {
+      "Ref": "TestStage"
+    }
+  },
+  "TestStageInvokeUrl": {
+    "Description": "description of TestStageInvokeUrl",
+    "Value": {
+      "Fn::Join": [
+        "",
+        [
+          "https://",
+          {
+            "Ref": "TestRestApi"
+          },
+          ".execute-api.",
+          {
+            "Ref": "AWS::Region"
+          },
+          ".#{DOMAIN}/",
+          {
+            "Ref": "TestStage"
+          }
+        ]
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/output-user-pool-client_test.rb

@@ -0,0 +1,39 @@
+require 'abstract_unit'
+
+class OutputUserPoolClientTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_output_user_pool_client "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestUserPoolClient": {
+    "Description": "description of TestUserPoolClient",
+    "Value": {
+      "Ref": "TestUserPoolClient"
+    }
+  },
+  "TestUserPoolClientSecret": {
+    "Description": "description of TestUserPoolClientSecret",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestUserPoolClient",
+        "ClientSecret"
+      ]
+    }
+  },
+  "TestUserPoolClientName": {
+    "Description": "description of TestUserPoolClientName",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestUserPoolClient",
+        "Name"
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/output-user-pool_test.rb

@@ -0,0 +1,48 @@
+require 'abstract_unit'
+
+class OutputUserPoolTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_output_user_pool "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestUserPool": {
+    "Description": "description of TestUserPool",
+    "Value": {
+      "Ref": "TestUserPool"
+    }
+  },
+  "TestUserPoolProviderName": {
+    "Description": "description of TestUserPoolProviderName",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestUserPool",
+        "ProviderName"
+      ]
+    }
+  },
+  "TestUserPoolProviderUrl": {
+    "Description": "description of TestUserPoolProviderUrl",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestUserPool",
+        "ProviderURL"
+      ]
+    }
+  },
+  "TestUserPoolArn": {
+    "Description": "description of TestUserPoolArn",
+    "Value": {
+      "Fn::GetAtt": [
+        "TestUserPool",
+        "Arn"
+      ]
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/template/output_test.rb

@@ -10,7 +10,9 @@ _output "test"
 {
   "Test": {
     "Description": "description of Test",
-    "Value": "Test"
+    "Value": {
+      "Ref": "Test"
+    }
   }
 }
     EOS

data/test/template/parameter-ec2_test.rb

@@ -6,11 +6,7 @@ class ParameterEc2Test < Minitest::Test
 _parameter_ec2 "test"
     EOS
     act_template = run_client_as_json(template)
-    allowed_values = []
-    EC2_INSTANCE_TYPES.each do |type|
-      allowed_values << "#{type}"
-    end
-    allowed_values = JSON.generate(allowed_values)
+    values = JSON.generate(EC2_INSTANCE_TYPES)
                        .gsub("[", "[\n      ")
                        .gsub("\",", "\",\n      ")
                        .gsub("\"]", "\"\n    ]")
@@ -19,13 +15,15 @@ _parameter_ec2 "test"
   "TestInstanceType": {
     "Type": "String",
     "Default": "#{EC2_DEFAULT_INSTANCE_TYPE}",
-    "AllowedValues": #{allowed_values},
-    "Description": "test instance type"
+    "Description": "test instance type",
+    "AllowedValues": #{values},
+    "NoEcho": "false"
   },
-  "TestDataVolumeSize": {
-    "Type": "String",
-    "Default": "100",
-    "Description": "test data volume size"
+  "TestRootVolumeSize": {
+    "Type": "Number",
+    "Default": "8",
+    "Description": "test root volume size",
+    "NoEcho": "false"
   }
 }
     EOS
@@ -35,11 +33,7 @@ _parameter_ec2 "test"
 _parameter_ec2 "test", iam_instance: "test", key_name: "test"
     EOS
     act_template = run_client_as_json(template)
-    allowed_values = []
-    EC2_INSTANCE_TYPES.each do |type|
-      allowed_values << "#{type}"
-    end
-    allowed_values = JSON.generate(allowed_values)
+    values = JSON.generate(EC2_INSTANCE_TYPES)
                        .gsub("[", "[\n      ")
                        .gsub("\",", "\",\n      ")
                        .gsub("\"]", "\"\n    ]")
@@ -48,23 +42,27 @@ _parameter_ec2 "test", iam_instance: "test", key_name: "test"
   "TestInstanceType": {
     "Type": "String",
     "Default": "#{EC2_DEFAULT_INSTANCE_TYPE}",
-    "AllowedValues": #{allowed_values},
-    "Description": "test instance type"
+    "Description": "test instance type",
+    "AllowedValues": #{values},
+    "NoEcho": "false"
   },
   "TestIamInstanceProfile": {
     "Type": "String",
     "Default": "test",
-    "Description": "test iam instance profile"
+    "Description": "test iam instance profile",
+    "NoEcho": "false"
   },
-  "TestDataVolumeSize": {
-    "Type": "String",
-    "Default": "100",
-    "Description": "test data volume size"
+  "TestRootVolumeSize": {
+    "Type": "Number",
+    "Default": "8",
+    "Description": "test root volume size",
+    "NoEcho": "false"
   },
   "TestKeyName": {
     "Type": "AWS::EC2::KeyPair::KeyName",
     "Default": "test",
-    "Description": "test key name"
+    "Description": "test key name",
+    "NoEcho": "false"
   }
 }
     EOS

data/test/template/parameter-elasticache_test.rb

@@ -18,10 +18,11 @@ _parameter_elasticache "test"
   "TestCacheNodeTypes": {
     "Type": "String",
     "Default": "#{ELASTICACHE_DEFAULT_NODE_TYPE}",
+    "Description": "test cache node types",
     "AllowedValues": [
 #{values.chomp}
     ],
-    "Description": "test cache node types"
+    "NoEcho": "false"
   }
 }
     EOS

data/test/template/parameter-rds_test.rb

@@ -10,18 +10,47 @@ class ParameterRdsTest < Minitest::Test
 EOS
     end
     template = <<-EOS
-_parameter_rds "test"
+_parameter_rds "test", port: "test", user_name: "test", user_password: "test", db_name: "test"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
-  "TestDbInstanceClasses": {
+  "TestDbInstanceClass": {
     "Type": "String",
     "Default": "#{RDS_DEFAULT_INSTANCE_CLASS}",
+    "Description": "test db instance db instance classes",
     "AllowedValues": [
 #{values.chomp}
     ],
-    "Description": "test db instance classes"
+    "NoEcho": "false"
+  },
+  "TestDbPort": {
+    "Type": "Number",
+    "Default": "test",
+    "Description": "test db instance db port",
+    "NoEcho": "false"
+  },
+  "TestDbName": {
+    "Type": "String",
+    "Default": "test",
+    "Description": "test db instance db name",
+    "NoEcho": "false"
+  },
+  "TestDbMasterUserName": {
+    "Type": "String",
+    "Default": "test",
+    "Description": "test db instance db master user name",
+    "MaxLength": "16",
+    "MinLength": "2",
+    "NoEcho": "false"
+  },
+  "TestDbMasterUserPassword": {
+    "Type": "String",
+    "Default": "test",
+    "Description": "test db instance db master user password",
+    "MaxLength": "64",
+    "MinLength": "8",
+    "NoEcho": "true"
   }
 }
     EOS

data/test/template/parameter-redshift_test.rb

@@ -10,7 +10,7 @@ class ParameterRdsInstanceTest < Minitest::Test
 EOS
     end
     template = <<-EOS
-_parameter_redshift "test"
+_parameter_redshift "test", port: "test", user_name: "test", user_password: "test", db_name: "test"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -18,10 +18,39 @@ _parameter_redshift "test"
   "TestRedshiftClusterNodeTypes": {
     "Type": "String",
     "Default": "#{REDSHIFT_DEFAULT_NODE_TYPE}",
+    "Description": "test redshift cluster node types",
     "AllowedValues": [
 #{values.chomp}
     ],
-    "Description": "test redshift cluster node types"
+    "NoEcho": "false"
+  },
+  "TestRedshiftClusterPort": {
+    "Type": "Number",
+    "Default": "test",
+    "Description": "test redshift cluster port",
+    "NoEcho": "false"
+  },
+  "TestRedshiftClusterDbName": {
+    "Type": "String",
+    "Default": "test",
+    "Description": "test redshift cluster db name",
+    "NoEcho": "false"
+  },
+  "TestRedshiftClusterMasterUserName": {
+    "Type": "String",
+    "Default": "test",
+    "Description": "test redshift cluster master user name",
+    "MaxLength": "16",
+    "MinLength": "2",
+    "NoEcho": "false"
+  },
+  "TestRedshiftClusterMasterUserPassword": {
+    "Type": "String",
+    "Default": "test",
+    "Description": "test redshift cluster master user password",
+    "MaxLength": "64",
+    "MinLength": "8",
+    "NoEcho": "true"
   }
 }
     EOS

data/test/template/parameter_test.rb

@@ -11,28 +11,61 @@ _parameter "test"
   "Test": {
     "Type": "String",
     "Default": "",
-    "Description": ""
+    "Description": "test parameter description",
+    "NoEcho": "false"
   }
 }
     EOS
     assert_equal exp_template.chomp, act_template
 
     template = <<-EOS
-_parameter "test", { type: "type", default: "default", description: "desc", allowed_values: [ "1", "2" ], no_echo: true }
+_parameter "test", { default: "default", description: "desc", values: %w( 1 2 ) }
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
 {
   "Test": {
-    "Type": "type",
+    "Type": "String",
     "Default": "default",
+    "Description": "desc",
     "AllowedValues": [
       "1",
       "2"
     ],
-    "Description": "desc",
+    "NoEcho": "false"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+_parameter "test password", { default: "default", no_echo: true }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestPassword": {
+    "Type": "String",
+    "Default": "default",
+    "Description": "test password parameter description",
     "NoEcho": "true"
   }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+_parameter "test", { default: "default", type: "instance id" }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Type": "AWS::EC2::Instance::Id",
+    "Default": "default",
+    "Description": "test parameter description",
+    "NoEcho": "false"
+  }
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/template/rds-db-cluster-parameter-group_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class RdsDbClusterParameterGroupTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_rds_db_cluster_parameter_group "test", parameters: { test: "test" }
+_rds_db_cluster_parameter_group "test", engine: 'aurora', parameters: { test: "test" }
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS

data/test/template/rds-db-cluster_test.rb

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class RdsDbClusterTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_rds_db_cluster "test", ref_parameter: "test", ref_subnet: "test", ref_user_name: "test", ref_user_password: "test", ref_security_groups: "test"
+_rds_db_cluster "test", ref_parameter: "test", ref_subnet_group: "test", ref_db_name: "test", ref_user_name: "test", ref_user_password: "test", ref_security_groups: "test"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -11,25 +11,9 @@ _rds_db_cluster "test", ref_parameter: "test", ref_subnet: "test", ref_user_name
   "TestDbCluster": {
     "Type": "AWS::RDS::DBCluster",
     "Properties": {
-      "AvailabilityZone": {
-        "Fn::GetAtt": [
-          "TestSubnet",
-          "AvailabilityZone"
-        ]
-      },
       "BackupRetentionPeriod": "7",
       "DatabaseName": {
-        "Fn::Join": [
-          "-",
-          [
-            {
-              "Ref": "Service"
-            },
-            {
-              "Ref": "Name"
-            }
-          ]
-        ]
+        "Ref": "TestDbName"
       },
       "DBClusterParameterGroupName": {
         "Ref": "TestDbClusterParameterGroup"
@@ -37,8 +21,8 @@ _rds_db_cluster "test", ref_parameter: "test", ref_subnet: "test", ref_user_name
       "DBSubnetGroupName": {
         "Ref": "TestDbSubnetGroup"
       },
-      "Engine": "aurora",
-      "EngineVersion": "5.6.10a",
+      "Engine": "aurora-mysql",
+      "EngineVersion": "#{RDS_DEFAULT_ENGINE_VERSION[:'aurora-mysql']}",
       "MasterUsername": {
         "Ref": "TestDbMasterUserName"
       },