RubyGems - kumogata-template - Versions diffs - 0.0.35 → 0.0.36 - Mend

kumogata-template 0.0.35 → 0.0.36

Files changed (278) hide show

checksums.yaml +5 -5
data/.travis.yml +4 -2
data/Gemfile +1 -1
data/Rakefile +1 -1
data/kumogata-template.gemspec +4 -4
data/lib/kumogata/template/alb.rb +48 -34
data/lib/kumogata/template/api-gateway.rb +262 -0
data/lib/kumogata/template/autoscaling.rb +17 -44
data/lib/kumogata/template/certificate.rb +11 -8
data/lib/kumogata/template/cloudfront.rb +67 -60
data/lib/kumogata/template/cloudwatch.rb +7 -12
data/lib/kumogata/template/codebuild.rb +4 -8
data/lib/kumogata/template/codecommit.rb +2 -6
data/lib/kumogata/template/codedeploy.rb +15 -0
data/lib/kumogata/template/cognito.rb +203 -0
data/lib/kumogata/template/const.rb +109 -47
data/lib/kumogata/template/datapipeline.rb +16 -47
data/lib/kumogata/template/dynamodb.rb +17 -8
data/lib/kumogata/template/ec2.rb +61 -10
data/lib/kumogata/template/ecr.rb +11 -9
data/lib/kumogata/template/ecs.rb +256 -91
data/lib/kumogata/template/elasticbeanstalk.rb +6 -9
data/lib/kumogata/template/elb.rb +9 -24
data/lib/kumogata/template/emr.rb +184 -51
data/lib/kumogata/template/events.rb +22 -10
data/lib/kumogata/template/ext/kumogata.rb +7 -7
data/lib/kumogata/template/helper.rb +189 -130
data/lib/kumogata/template/iam.rb +556 -146
data/lib/kumogata/template/kinesis.rb +282 -0
data/lib/kumogata/template/lambda.rb +43 -2
data/lib/kumogata/template/logs.rb +2 -6
data/lib/kumogata/template/nlb.rb +10 -0
data/lib/kumogata/template/pinpoint.rb +83 -0
data/lib/kumogata/template/rds.rb +52 -0
data/lib/kumogata/template/redshift.rb +15 -6
data/lib/kumogata/template/role.rb +425 -0
data/lib/kumogata/template/s3.rb +120 -80
data/lib/kumogata/template/sns.rb +2 -6
data/lib/kumogata/template/version.rb +1 -1
data/lib/kumogata/template.rb +9 -1
data/template/_template.rb +2 -2
data/template/alb-load-balancer.rb +5 -4
data/template/alb-target-group.rb +8 -9
data/template/api-gateway-account.rb +15 -0
data/template/api-gateway-api-key.rb +22 -0
data/template/api-gateway-authorizer.rb +38 -0
data/template/api-gateway-base-path-mapping.rb +23 -0
data/template/api-gateway-client-certificate.rb +16 -0
data/template/api-gateway-deployment.rb +24 -0
data/template/api-gateway-domain-name.rb +17 -0
data/template/api-gateway-method.rb +71 -0
data/template/api-gateway-model.rb +23 -0
data/template/api-gateway-resource.rb +32 -0
data/template/api-gateway-rest-api.rb +29 -0
data/template/api-gateway-stage.rb +33 -0
data/template/api-gateway-usage-plan-key.rb +19 -0
data/template/api-gateway-usage-plan.rb +24 -0
data/template/autoscaling-group.rb +2 -2
data/template/autoscaling-launch-configuration.rb +7 -4
data/template/autoscaling-scheduled-action.rb +0 -1
data/template/certificate.rb +2 -2
data/template/cloudfront-distribution.rb +4 -0
data/template/cloudfront-origin-access-identity.rb +19 -0
data/template/cloudtrail.rb +6 -4
data/template/cloudwatch-alarm.rb +9 -3
data/template/codebuild-project.rb +3 -3
data/template/codecommit-repository.rb +2 -2
data/template/codedeploy-application.rb +1 -1
data/template/codedeploy-deployment-config.rb +1 -1
data/template/codedeploy-deployment-group.rb +2 -0
data/template/cognito-identity-pool.rb +34 -0
data/template/cognito-identity-role-attachment.rb +22 -0
data/template/cognito-user-pool-client.rb +28 -0
data/template/cognito-user-pool-group.rb +24 -0
data/template/cognito-user-pool-user-to-group-attachment.rb +20 -0
data/template/cognito-user-pool-user.rb +28 -0
data/template/cognito-user-pool.rb +45 -0
data/template/datapipeline-pipeline.rb +4 -4
data/template/dynamodb-table.rb +5 -1
data/template/ec2-eip-association.rb +1 -1
data/template/ec2-instance.rb +4 -1
data/template/ec2-nat-gateway.rb +4 -0
data/template/ec2-route.rb +4 -0
data/template/ec2-security-group-ingress.rb +1 -1
data/template/ec2-security-group.rb +2 -2
data/template/ec2-subnet.rb +8 -4
data/template/ec2-volume.rb +1 -2
data/template/ec2-vpc-cidr-block.rb +4 -2
data/template/ec2-vpc-endpoint.rb +5 -2
data/template/ecr-repository.rb +2 -2
data/template/ecs-cluster.rb +1 -1
data/template/ecs-service.rb +19 -7
data/template/ecs-task-definition.rb +4 -4
data/template/elasticache-cache-cluster.rb +1 -1
data/template/elasticache-parameter-group.rb +1 -1
data/template/elasticache-replication-group.rb +1 -1
data/template/elasticache-subnet-group.rb +1 -1
data/template/elasticbeanstalk-application-version.rb +1 -1
data/template/elasticbeanstalk-application.rb +1 -1
data/template/elasticbeanstalk-configuration-template.rb +1 -1
data/template/elasticbeanstalk-environment.rb +1 -1
data/template/elb-load-balancer.rb +2 -2
data/template/emr-cluster.rb +3 -3
data/template/emr-instance-group-config.rb +4 -2
data/template/emr-security-configuration.rb +17 -0
data/template/emr-step.rb +2 -2
data/template/events-rule.rb +8 -8
data/template/iam-group.rb +2 -2
data/template/iam-instance-profile.rb +2 -2
data/template/iam-managed-policy.rb +1 -1
data/template/iam-policy.rb +1 -1
data/template/iam-role.rb +17 -2
data/template/iam-user.rb +4 -4
data/template/kinesis-firehose-delivery-stream.rb +36 -0
data/template/kinesis-stream.rb +21 -0
data/template/kms-alias.rb +2 -2
data/template/kms-key.rb +1 -1
data/template/lambda-alias.rb +2 -2
data/template/lambda-event-source-mapping.rb +4 -4
data/template/lambda-function.rb +17 -17
data/template/lambda-permission.rb +31 -10
data/template/lambda-version.rb +4 -2
data/template/logs-destination.rb +1 -1
data/template/logs-log-group.rb +1 -1
data/template/logs-log-stream.rb +4 -2
data/template/logs-metric-filter.rb +1 -1
data/template/logs-subscription_filter.rb +1 -1
data/template/mappings-ec2.rb +114 -52
data/template/output-arn.rb +12 -4
data/template/output-certificate.rb +11 -0
data/template/output-distribution.rb +11 -0
data/template/output-domain-name.rb +11 -0
data/template/output-ecr-repository.rb +16 -0
data/template/output-eip.rb +11 -0
data/template/output-lambda-function.rb +6 -0
data/template/output-name.rb +7 -2
data/template/output-origin-access-identity.rb +13 -0
data/template/output-rds-cluster.rb +17 -0
data/template/{output-rds.rb → output-rds-instance.rb} +1 -1
data/template/output-redshift.rb +11 -0
data/template/output-rest-api.rb +11 -0
data/template/output-s3.rb +3 -0
data/template/output-stage.rb +19 -0
data/template/output-subnet.rb +6 -3
data/template/output-trail.rb +14 -0
data/template/output-user-pool-client.rb +14 -0
data/template/output-user-pool.rb +17 -0
data/template/output-vpc.rb +13 -3
data/template/output.rb +3 -2
data/template/parameter-ec2.rb +10 -4
data/template/parameter-elasticache.rb +1 -1
data/template/parameter-rds.rb +51 -4
data/template/parameter-redshift.rb +31 -1
data/template/parameter.rb +87 -7
data/template/rds-db-cluster-parameter-group.rb +18 -4
data/template/rds-db-cluster.rb +19 -7
data/template/rds-db-instance.rb +55 -131
data/template/rds-db-parameter-group.rb +29 -3
data/template/rds-db-subnet-group.rb +1 -1
data/template/rds-event-subscription.rb +2 -4
data/template/rds-option-group.rb +28 -5
data/template/redshift-cluster-parameter-group.rb +3 -1
data/template/redshift-cluster-security-group.rb +17 -0
data/template/redshift-cluster-subnet-group.rb +3 -1
data/template/redshift-cluster.rb +15 -12
data/template/s3-bucket.rb +10 -5
data/template/sns-topic.rb +2 -2
data/template/sqs-queue.rb +1 -1
data/test/abstract_unit.rb +2 -9
data/test/cloudfront_test.rb +57 -28
data/test/codedeploy_test.rb +21 -0
data/test/datapipeline_test.rb +0 -22
data/test/ec2_test.rb +12 -52
data/test/ecs_test.rb +30 -26
data/test/emr_test.rb +101 -20
data/test/events_test.rb +47 -0
data/test/helper_test.rb +251 -281
data/test/iam_test.rb +572 -57
data/test/lambda_test.rb +1 -1
data/test/s3_test.rb +49 -14
data/test/template/alb-load-balancer_test.rb +4 -5
data/test/template/alb-target-group_test.rb +1 -3
data/test/template/api-gateway-account_test.rb +26 -0
data/test/template/api-gateway-api-key_test.rb +33 -0
data/test/template/api-gateway-authorizer_test.rb +62 -0
data/test/template/api-gateway-base-path-mapping_test.rb +27 -0
data/test/template/api-gateway-client-certificate_test.rb +21 -0
data/test/template/api-gateway-deployment_test.rb +27 -0
data/test/template/api-gateway-domain-name_test.rb +26 -0
data/test/template/api-gateway-method_test.rb +29 -0
data/test/template/api-gateway-model_test.rb +37 -0
data/test/template/api-gateway-resource_test.rb +82 -0
data/test/template/api-gateway-rest-api_test.rb +33 -0
data/test/template/api-gateway-stage_test.rb +39 -0
data/test/template/api-gateway-usage-plan-key_test.rb +25 -0
data/test/template/api-gateway-usage-plan_test.rb +42 -0
data/test/template/cloudfront-distribution_test.rb +41 -3
data/test/template/cloudtrail_test.rb +13 -5
data/test/template/cloudwatch-alarm_test.rb +14 -2
data/test/template/codebuild-project_test.rb +2 -11
data/test/template/codecommit-repository_test.rb +12 -1
data/test/template/cognito-identity-pool_test.rb +32 -0
data/test/template/cognito-identity-role-attachment_test.rb +38 -0
data/test/template/cognito-user-pool-client_test.rb +36 -0
data/test/template/cognito-user-pool-group_test.rb +36 -0
data/test/template/cognito-user-pool-user-to-group-attachment_test.rb +29 -0
data/test/template/cognito-user-pool-user_test.rb +38 -0
data/test/template/cognito-user-pool_test.rb +99 -0
data/test/template/datapipeline-pipeline_test.rb +45 -6
data/test/template/dynamodb-table_test.rb +19 -1
data/test/template/ec2-instance_test.rb +9 -1
data/test/template/ec2-nat-gateway_test.rb +29 -1
data/test/template/ec2-security-group-egress_test.rb +1 -0
data/test/template/ec2-security-group-ingress_test.rb +1 -0
data/test/template/ec2-security-group_test.rb +11 -1
data/test/template/ec2-spot-fleet_test.rb +1 -1
data/test/template/ec2-subnet_test.rb +62 -1
data/test/template/ec2-vpc-cidr-block_test.rb +1 -1
data/test/template/ec2-vpc-endpoint_test.rb +56 -0
data/test/template/ecr-repository_test.rb +63 -11
data/test/template/ecs-service_test.rb +13 -2
data/test/template/ecs-task-definition_test.rb +86 -13
data/test/template/elasticache-cache-cluster_test.rb +4 -6
data/test/template/elasticache-replication-group_test.rb +1 -1
data/test/template/elasticbeanstalk-application-version_test.rb +1 -0
data/test/template/elasticbeanstalk-application_test.rb +2 -1
data/test/template/elasticbeanstalk-configuration-template_test.rb +2 -1
data/test/template/elasticbeanstalk-template_test.rb +1 -0
data/test/template/elb-load-balancer_test.rb +1 -3
data/test/template/emr-cluster_test.rb +2 -14
data/test/template/emr-instance-group-config_test.rb +2 -4
data/test/template/emr-security-configuration_test.rb +34 -0
data/test/template/emr-step_test.rb +2 -6
data/test/template/events-rule_test.rb +3 -3
data/test/template/iam-group_test.rb +11 -1
data/test/template/iam-instance-profile_test.rb +11 -1
data/test/template/iam-managed-policy_test.rb +1 -0
data/test/template/iam-policy_test.rb +1 -3
data/test/template/iam-role_test.rb +12 -2
data/test/template/iam-user_test.rb +11 -17
data/test/template/kinesis-firehorse-delivery-stream_test.rb +68 -0
data/test/template/kinesis-stream_test.rb +61 -0
data/test/template/kms-key_test.rb +1 -0
data/test/template/lambda-alias_test.rb +2 -3
data/test/template/lambda-event-source-mapping_test.rb +1 -1
data/test/template/lambda-function_test.rb +20 -32
data/test/template/lambda-permission_test.rb +7 -4
data/test/template/lambda-version_test.rb +5 -2
data/test/template/logs-log-group_test.rb +1 -3
data/test/template/logs-log-stream_test.rb +2 -6
data/test/template/logs-metric-filter_test.rb +1 -3
data/test/template/logs-subscription-filter_test.rb +1 -3
data/test/template/mappings-ec2_test.rb +10 -3
data/test/template/output-domain-name_test.rb +30 -0
data/test/template/output-name_test.rb +9 -0
data/test/template/{output-rds_test.rb → output-rds-instance_test.rb} +2 -2
data/test/template/output-rest-api_test.rb +30 -0
data/test/template/output-s3_test.rb +9 -0
data/test/template/output-stage_test.rb +43 -0
data/test/template/output-user-pool-client_test.rb +39 -0
data/test/template/output-user-pool_test.rb +48 -0
data/test/template/output_test.rb +3 -1
data/test/template/parameter-ec2_test.rb +22 -24
data/test/template/parameter-elasticache_test.rb +2 -1
data/test/template/parameter-rds_test.rb +32 -3
data/test/template/parameter-redshift_test.rb +31 -2
data/test/template/parameter_test.rb +37 -4
data/test/template/rds-db-cluster-parameter-group_test.rb +1 -1
data/test/template/rds-db-cluster_test.rb +4 -20
data/test/template/rds-db-instance_test.rb +3 -373
data/test/template/rds-db-parameter-group_test.rb +1 -1
data/test/template/rds-option-group_test.rb +2 -2
data/test/template/redshift-cluster-parameter-group_test.rb +28 -0
data/test/template/redshift-cluster-security-group_test.rb +49 -0
data/test/template/redshift-cluster-subnet-group_test.rb +28 -0
data/test/template/redshift-cluster_test.rb +33 -5
data/test/template/s3-bucket_test.rb +6 -20
metadata +130 -22

data/test/template/rds-db-instance_test.rb CHANGED Viewed

@@ -3,14 +3,7 @@ require 'abstract_unit'
 class RdsDbInstanceTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_rds_db_instance "test",
-                 ref_db_name: "test",
-                 ref_port: "test",
-                 ref_subnet: "test",
-                 ref_security_groups: "test",
-                 ref_user_name: "test",
-                 ref_user_password: "test",
-                 az: "test"
+_rds_db_instance "test", ref_db_name: "test", ref_port: "test", ref_subnet_group: "test", ref_security_groups: "test", ref_user_name: "test", ref_user_password: "test", az: "test"
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -31,9 +24,7 @@ _rds_db_instance "test",
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },
@@ -45,7 +36,7 @@ _rds_db_instance "test",
         "Ref": "TestDbSubnetGroup"
       },
       "Engine": "mysql",
-      "EngineVersion": "5.7.17",
+      "EngineVersion": "#{RDS_DEFAULT_ENGINE_VERSION[:mysql]}",
       "MasterUsername": {
         "Ref": "TestDbMasterUserName"
       },
@@ -96,367 +87,6 @@ _rds_db_instance "test",
       ]
     }
   }
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-  end
-  def test_single_master
-    template = <<-EOS
-_rds_db_instance 'test',
-                 instance_class: 'db.t2.micro',
-                 engine: 'mysql', engine_version: '5.7.17',
-                 ref_db_name: 'test',
-                 ref_subnet: 'test',
-                 ref_security_groups: %w( test ),
-                 ref_port: 'test',
-                 ref_user_name: 'test',
-                 ref_user_password: 'test'
-    EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "TestDbInstance": {
-    "Type": "AWS::RDS::DBInstance",
-    "Properties": {
-      "AllocatedStorage": "5",
-      "AllowMajorVersionUpgrade": "true",
-      "AutoMinorVersionUpgrade": "true",
-      "BackupRetentionPeriod": "7",
-      "DBInstanceClass": "db.t2.micro",
-      "DBInstanceIdentifier": {
-        "Fn::Join": [
-          "-",
-          [
-            {
-              "Ref": "Service"
-            },
-            {
-              "Ref": "Name"
-            }
-          ]
-        ]
-      },
-      "DBName": {
-        "Ref": "TestDbName"
-      },
-      "DBParameterGroupName": "default.mysql5.7",
-      "DBSubnetGroupName": {
-        "Ref": "TestDbSubnetGroup"
-      },
-      "Engine": "mysql",
-      "EngineVersion": "5.7.17",
-      "MasterUsername": {
-        "Ref": "TestDbMasterUserName"
-      },
-      "MasterUserPassword": {
-        "Ref": "TestDbMasterUserPassword"
-      },
-      "MonitoringInterval": "0",
-      "MultiAZ": "false",
-      "Port": {
-        "Ref": "TestDbPort"
-      },
-      "PreferredBackupWindow": "21:30-22:00",
-      "PreferredMaintenanceWindow": "Thu:20:30-Thu:21:00",
-      "PubliclyAccessible": "false",
-      "StorageType": "gp2",
-      "Tags": [
-        {
-          "Key": "Name",
-          "Value": {
-            "Fn::Join": [
-              "-",
-              [
-                {
-                  "Ref": "Service"
-                },
-                "test"
-              ]
-            ]
-          }
-        },
-        {
-          "Key": "Service",
-          "Value": {
-            "Ref": "Service"
-          }
-        },
-        {
-          "Key": "Version",
-          "Value": {
-            "Ref": "Version"
-          }
-        }
-      ],
-      "VPCSecurityGroups": [
-        {
-          "Ref": "TestSecurityGroup"
-        }
-      ]
-    }
-  }
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-  end
-  def test_cluster
-    template = <<-EOS
-_rds_db_instance 'test cluster',
-                  engine: 'aurora',
-                  instance_class: 'db.t2.medium',
-                  ref_cluster: 'test'
-EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "TestClusterDbInstance": {
-    "Type": "AWS::RDS::DBInstance",
-    "Properties": {
-      "AllowMajorVersionUpgrade": "true",
-      "AutoMinorVersionUpgrade": "true",
-      "DBClusterIdentifier": {
-        "Ref": "TestDbCluster"
-      },
-      "DBInstanceClass": "db.t2.medium",
-      "DBInstanceIdentifier": {
-        "Fn::Join": [
-          "-",
-          [
-            {
-              "Ref": "Service"
-            },
-            {
-              "Ref": "Name"
-            }
-          ]
-        ]
-      },
-      "DBParameterGroupName": "default.aurora5.6",
-      "Engine": "aurora",
-      "EngineVersion": "5.6.10a",
-      "MonitoringInterval": "0",
-      "PubliclyAccessible": "false",
-      "Tags": [
-        {
-          "Key": "Name",
-          "Value": {
-            "Fn::Join": [
-              "-",
-              [
-                {
-                  "Ref": "Service"
-                },
-                "test-cluster"
-              ]
-            ]
-          }
-        },
-        {
-          "Key": "Service",
-          "Value": {
-            "Ref": "Service"
-          }
-        },
-        {
-          "Key": "Version",
-          "Value": {
-            "Ref": "Version"
-          }
-        }
-      ]
-    }
-  }
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-  end
-  def test_slave
-    template = <<-EOS
-_rds_db_instance 'test',
-                 master_instance: 'master',
-                  ref_port: 'test',
-                 source_db: 'master',
-                 instance_class: 'db.t2.micro',
-                 engine: 'mysql',
-                 engine_version: '5.7.17',
-                 ref_security_groups: %w( test )
-EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "TestDbInstance": {
-    "Type": "AWS::RDS::DBInstance",
-    "Properties": {
-      "AllocatedStorage": "5",
-      "AllowMajorVersionUpgrade": "true",
-      "AutoMinorVersionUpgrade": "true",
-      "DBInstanceClass": "db.t2.micro",
-      "DBInstanceIdentifier": {
-        "Fn::Join": [
-          "-",
-          [
-            {
-              "Ref": "Service"
-            },
-            {
-              "Ref": "Name"
-            }
-          ]
-        ]
-      },
-      "DBParameterGroupName": "default.mysql5.7",
-      "Engine": "mysql",
-      "EngineVersion": "5.7.17",
-      "MonitoringInterval": "0",
-      "MultiAZ": "false",
-      "Port": {
-        "Ref": "TestDbPort"
-      },
-      "PreferredMaintenanceWindow": "Thu:20:30-Thu:21:00",
-      "PubliclyAccessible": "false",
-      "SourceDBInstanceIdentifier": "master",
-      "StorageType": "gp2",
-      "Tags": [
-        {
-          "Key": "Name",
-          "Value": {
-            "Fn::Join": [
-              "-",
-              [
-                {
-                  "Ref": "Service"
-                },
-                "test"
-              ]
-            ]
-          }
-        },
-        {
-          "Key": "Service",
-          "Value": {
-            "Ref": "Service"
-          }
-        },
-        {
-          "Key": "Version",
-          "Value": {
-            "Ref": "Version"
-          }
-        }
-      ],
-      "VPCSecurityGroups": [
-        {
-          "Ref": "TestSecurityGroup"
-        }
-      ]
-    },
-    "DependsOn": "MasterDbInstance"
-  }
-}
-    EOS
-    assert_equal exp_template.chomp, act_template
-  end
-  def test_multiaz
-    template = <<-EOS
-_rds_db_instance 'test',
-                 instance_class: 'db.t2.micro',
-                 engine: 'mysql',
-                 engine_version: '5.7.17',
-                 ref_db_name: 'test',
-                 ref_subnet: 'test',
-                 ref_security_groups: %w( test ),
-                 ref_user_name: 'test',
-                 ref_user_password: 'test',
-                 ref_port: 'test',
-                 multi_az: true
-EOS
-    act_template = run_client_as_json(template)
-    exp_template = <<-EOS
-{
-  "TestDbInstance": {
-    "Type": "AWS::RDS::DBInstance",
-    "Properties": {
-      "AllocatedStorage": "5",
-      "AllowMajorVersionUpgrade": "true",
-      "AutoMinorVersionUpgrade": "true",
-      "BackupRetentionPeriod": "7",
-      "DBInstanceClass": "db.t2.micro",
-      "DBInstanceIdentifier": {
-        "Fn::Join": [
-          "-",
-          [
-            {
-              "Ref": "Service"
-            },
-            {
-              "Ref": "Name"
-            }
-          ]
-        ]
-      },
-      "DBName": {
-        "Ref": "TestDbName"
-      },
-      "DBParameterGroupName": "default.mysql5.7",
-      "DBSubnetGroupName": {
-        "Ref": "TestDbSubnetGroup"
-      },
-      "Engine": "mysql",
-      "EngineVersion": "5.7.17",
-      "MasterUsername": {
-        "Ref": "TestDbMasterUserName"
-      },
-      "MasterUserPassword": {
-        "Ref": "TestDbMasterUserPassword"
-      },
-      "MonitoringInterval": "0",
-      "MultiAZ": "true",
-      "Port": {
-        "Ref": "TestDbPort"
-      },
-      "PreferredBackupWindow": "21:30-22:00",
-      "PreferredMaintenanceWindow": "Thu:20:30-Thu:21:00",
-      "PubliclyAccessible": "false",
-      "StorageType": "gp2",
-      "Tags": [
-        {
-          "Key": "Name",
-          "Value": {
-            "Fn::Join": [
-              "-",
-              [
-                {
-                  "Ref": "Service"
-                },
-                "test"
-              ]
-            ]
-          }
-        },
-        {
-          "Key": "Service",
-          "Value": {
-            "Ref": "Service"
-          }
-        },
-        {
-          "Key": "Version",
-          "Value": {
-            "Ref": "Version"
-          }
-        }
-      ],
-      "VPCSecurityGroups": [
-        {
-          "Ref": "TestSecurityGroup"
-        }
-      ]
-    }
-  }
 }
     EOS
     assert_equal exp_template.chomp, act_template

data/test/template/rds-db-parameter-group_test.rb CHANGED Viewed

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

data/test/template/rds-option-group_test.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require 'abstract_unit'
 class RdsOptionGroupTest < Minitest::Test
   def test_normal
     template = <<-EOS
-_rds_option_group "test", configurations: [ { OptionName: "MEMCACHED" } ]
+_rds_option_group "test", configurations: [ { name: "MEMCACHED" } ]
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -14,7 +14,7 @@ _rds_option_group "test", configurations: [ { OptionName: "MEMCACHED" } ]
       "EngineName": "mysql",
       "MajorEngineVersion": "5.7",
       "OptionGroupDescription": "test option group description",
-      "OptionGroupConfigurations": [
+      "OptionConfigurations": [
         {
           "OptionName": "MEMCACHED"
         }

data/test/template/redshift-cluster-parameter-group_test.rb CHANGED Viewed

@@ -19,6 +19,34 @@ _redshift_cluster_parameter_group "test", parameters: parameters
           "ParameterName": "enable_user_activity_logging",
           "ParameterValue": "true"
         }
+      ],
+      "Tags": [
+        {
+          "Key": "Name",
+          "Value": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test"
+              ]
+            ]
+          }
+        },
+        {
+          "Key": "Service",
+          "Value": {
+            "Ref": "Service"
+          }
+        },
+        {
+          "Key": "Version",
+          "Value": {
+            "Ref": "Version"
+          }
+        }
       ]
     }
   }

data/test/template/redshift-cluster-security-group_test.rb ADDED Viewed

@@ -0,0 +1,49 @@
+require 'abstract_unit'
+class RedshiftClusterSecurityGroupTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_redshift_cluster_security_group "test"
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestRedshiftClusterSecurityGroup": {
+    "Type": "AWS::Redshift::ClusterSecurityGroup",
+    "Properties": {
+      "Description": "test redshift cluster security group description",
+      "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/redshift-cluster-subnet-group_test.rb CHANGED Viewed

@@ -16,6 +16,34 @@ _redshift_cluster_subnet_group "test", ref_subnets: "test"
         {
           "Ref": "TestSubnet"
         }
+      ],
+      "Tags": [
+        {
+          "Key": "Name",
+          "Value": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test"
+              ]
+            ]
+          }
+        },
+        {
+          "Key": "Service",
+          "Value": {
+            "Ref": "Service"
+          }
+        },
+        {
+          "Key": "Version",
+          "Value": {
+            "Ref": "Version"
+          }
+        }
       ]
     }
   }

data/test/template/redshift-cluster_test.rb CHANGED Viewed

@@ -21,18 +21,46 @@ _redshift_cluster "test", ref_db_name: "test", ref_parameter: "test", ref_subnet
       },
       "ClusterType": "single-node",
       "DBName": {
-        "Ref": "TestDbName"
+        "Ref": "TestRedshiftClusterDbName"
       },
       "MasterUsername": {
-        "Ref": "TestClusterMasterUserName"
+        "Ref": "TestRedshiftClusterMasterUserName"
       },
       "MasterUserPassword": {
-        "Ref": "TestClusterMasterUserPassword"
+        "Ref": "TestRedshiftClusterMasterUserPassword"
       },
-      "NodeType": "ds1.xlarge",
-      "Port": "5439",
+      "NodeType": "#{REDSHIFT_DEFAULT_NODE_TYPE}",
+      "Port": "#{PORT[:redshift]}",
       "PreferredMaintenanceWindow": "Thu:20:45-Thu:21:15",
       "PubliclyAccessible": "false",
+      "Tags": [
+        {
+          "Key": "Name",
+          "Value": {
+            "Fn::Join": [
+              "-",
+              [
+                {
+                  "Ref": "Service"
+                },
+                "test"
+              ]
+            ]
+          }
+        },
+        {
+          "Key": "Service",
+          "Value": {
+            "Ref": "Service"
+          }
+        },
+        {
+          "Key": "Version",
+          "Value": {
+            "Ref": "Version"
+          }
+        }
+      ],
       "VpcSecurityGroupIds": [
         {
           "Ref": "TestSecurityGroup"

data/test/template/s3-bucket_test.rb CHANGED Viewed

@@ -19,9 +19,7 @@ _s3_bucket "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },
@@ -63,7 +61,7 @@ _s3_bucket "test"
   def test_aws_website
     template = <<-EOS
-_s3_bucket "test", bucket: "PublicBucket", website: { error: "error.html", index: "index.html", routing: [ routing: { http: "404", key_prefix: "out1/" }, redirect: { host: "ec2-11-22-333-44.compute-1.amazonaws.com", replace_key_prefix: "report-404/" } ] }
+_s3_bucket "test", bucket: "bucket", website: { error: "error.html", index: "index.html", routing: [ routing: { http: "404", key_prefix: "out1/" }, redirect: { host: "ec2-11-22-333-44.compute-1.#{DOMAIN}", replace_key_prefix: "report-404/" } ] }
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -72,21 +70,11 @@ _s3_bucket "test", bucket: "PublicBucket", website: { error: "error.html", index
     "Type": "AWS::S3::Bucket",
     "Properties": {
       "AccessControl": "PublicRead",
-      "BucketName": "PublicBucket",
+      "BucketName": "bucket",
       "Tags": [
         {
           "Key": "Name",
-          "Value": {
-            "Fn::Join": [
-              "-",
-              [
-                {
-                  "Ref": "Service"
-                },
-                "test"
-              ]
-            ]
-          }
+          "Value": "bucket"
         },
         {
           "Key": "Service",
@@ -107,7 +95,7 @@ _s3_bucket "test", bucket: "PublicBucket", website: { error: "error.html", index
         "RoutingRules": [
           {
             "RedirectRule": {
-              "HostName": "ec2-11-22-333-44.compute-1.amazonaws.com",
+              "HostName": "ec2-11-22-333-44.compute-1.#{DOMAIN}",
               "ReplaceKeyPrefixWith": "report-404/"
             },
             "RoutingRuleCondition": {
@@ -143,9 +131,7 @@ _s3_bucket "test"
             {
               "Ref": "Service"
             },
-            {
-              "Ref": "Name"
-            }
+            "test"
           ]
         ]
       },