kumogata-template 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d33d48dd2211389e7f29644bf76c4980e96c897
-  data.tar.gz: fb141899507ce1094ef036664d5d32ce964acfce
+  metadata.gz: ae8579ef67a536e816f1044e3f6d61d55c2d22b2
+  data.tar.gz: a615fd47c3ffc560524002bb655501a0a2fdb6be
 SHA512:
-  metadata.gz: 2c3efe00793ebf4640aaa4d59cfdef9be243f8319d5d97bf4655e14d9d9e2a40d224bc1d617320f2d2740a8ef7330296492e8dbc9eba6395fb2a4b9cbbf16b79
-  data.tar.gz: d189c3ab32d1df96cb7108206fa52c55e6089ee2dde3cecbf2df2d494ba2c9a4fd4635f8b510391f793fb0538beb9d9f13b51dbdb0ec34d0a3fe83fd848dcbf6
+  metadata.gz: 15358466f358d1dd05be9d4f72134a5e9bb31cd9f186dd0b817fa3794ecac885c915f16f5f4a85a36e075a8f38c69d5e39e432dc28b9db086aa2bb460a457aca
+  data.tar.gz: 70cd674c8a2ed82bfef4300f264cfd5486ba4d887bd0095a0975d579c3a77a17fad34e98eebef86fab7105892ae32c700afe084b49d43b55d4f32c37fc17e0b7

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.31)
+    kumogata-template (0.0.33)
       aws-sdk (~> 2.3)
       kumogata2-plugin-ruby (= 0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.10.9)
-      aws-sdk-resources (= 2.10.9)
-    aws-sdk-core (2.10.9)
+    aws-sdk (2.10.47)
+      aws-sdk-resources (= 2.10.47)
+    aws-sdk-core (2.10.47)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.9)
-      aws-sdk-core (= 2.10.9)
-    aws-sigv4 (1.0.0)
-    coderay (1.1.1)
+    aws-sdk-resources (2.10.47)
+      aws-sdk-core (= 2.10.47)
+    aws-sigv4 (1.0.2)
+    coderay (1.1.2)
     diffy (3.2.0)
     dslh (0.4.8)
-    hashie (3.5.5)
+    hashie (3.5.6)
     highline (1.7.8)
     jmespath (1.3.1)
-    kumogata2 (0.1.12)
+    kumogata2 (0.1.15)
       aws-sdk (>= 2.3.0)
       coderay
       diffy
@@ -32,8 +32,8 @@ GEM
     kumogata2-plugin-ruby (0.1.3)
       dslh (>= 0.3.7)
       kumogata2
-    minitest (5.10.2)
-    rake (12.0.0)
+    minitest (5.10.3)
+    rake (12.1.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
     tins (1.15.0)
@@ -48,4 +48,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.15.1
+   1.15.4

data/lib/kumogata/template/const.rb

@@ -133,11 +133,10 @@ ELASTICACHE_NODE_TYPES =
 ELASTICACHE_DEFAULT_NODE_TYPE = "cache.t2.medium"
 
 # https://aws.amazon.com/rds/pricing/
+# http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html
 RDS_INSTANCE_CLASSES =
   [
    # Instance Class   vCPU   ECU   Memory (GB)   EBS Optimized   Network Performance
-   # db.t1.micro       1      1       .615         No              Very Low
-   # db.m1.small       1      1      1.7           No              Very Low
    # db.m4.large       2      6.5    8            450 Mbps         Moderate
    # db.m4.xlarge      4     13     16            750 Mbps         High
    # db.m4.2xlarge     8     25.5   32            1000 Mbps        High
@@ -152,18 +151,17 @@ RDS_INSTANCE_CLASSES =
    # db.t2.small       1      1      2             No              Low
    # db.t2.medium      2      2      4             No              Moderate
    # db.t2.large       2      2      8             No              Moderate
-   "db.t1.micro",
-   "db.m1.small", "db.m4.large", "db.m4.xlarge", "db.m4.2xlarge", "db.m4.4xlarge", "db.m4.10xlarge",
+   "db.m4.large", "db.m4.xlarge", "db.m4.2xlarge", "db.m4.4xlarge", "db.m4.10xlarge",
    "db.r3.large", "db.r3.xlarge", "db.r3.2xlarge", "db.r3.4xlarge", "db.r3.8xlarge",
-   "db.t2.micro", "db.t2.small", "db.t2.medium", "db.t2.large"
+   "db.t2.micro", "db.t2.small", "db.t2.medium", "db.t2.large",
   ]
 RDS_DEFAULT_INSTANCE_CLASS = "db.t2.medium"
 RDS_DEFAULT_ENGINE = "mysql"
 RDS_DEFAULT_ENGINE_VERSION = {
   mysql: "5.7.17",
-  mariadb: "10.1.19",
+  mariadb: "10.1.23",
   aurora: "5.6.10a",
-  postgres: "9.6.2-R1",
+  postgres: "9.6.2",
 }
 
 # https://aws.amazon.com/redshift/pricing/

data/lib/kumogata/template/helper.rb

@@ -39,6 +39,14 @@ def _description(name)
     chomp.slice(0, 1024)
 end
 
+def _empty?(value)
+  return true if value.nil?
+  return false if value.is_a? Integer
+  return false if value.is_a? TrueClass or value.is_a? FalseClass
+
+  value.empty?
+end
+
 def _valid_values(value, values, default = nil)
   return default if value.nil?
   values.collect{|v| return v if v =~ /^#{value}$/i }

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.32'
+KUMOGATA_TEMPLATE_VERSION = '0.0.33'

data/template/rds-db-cluster.rb

@@ -10,7 +10,7 @@ backup_retention = args[:backup_retention] || 7
 db_name = _ref_name("database", args, "database")
 parameter = _ref_string("parameter", args, "db cluster parameter group")
 parameter = "default.aurora5.6" if parameter.empty?
-subnet_group = _ref_string("subnet_group", args, "db subnet group")
+subnet_group = _ref_string("subnet", args, "db subnet group")
 engine = "aurora"
 engine_version = RDS_DEFAULT_ENGINE_VERSION[:aurora]
 user_name = _ref_string("user_name", args, "db master user name")

data/template/rds-db-instance.rb

@@ -5,92 +5,167 @@
 require 'kumogata/template/helper'
 
 name = _resource_name(args[:name], "db instance")
-engine = _valid_values(args[:engine],
-                       %w( mysql mariadb
-                           oracle-se1 oracle-se oracle-ee
-                           sqlserver-ee sqlserver-se sqlserver-ex sqlserver-web
-                           postgres aurora ), RDS_DEFAULT_ENGINE)
-allocated = args[:allocated] || 5
+allocated = _ref_string_default("allocated", args, "", 5)
 allow = _bool("allow", args, true)
 auto = _bool("auto", args, true)
 az = _availability_zone(args, false)
-backup_retention = args[:backup_retention] || 7
-character = args[:character] || ""
+backup_retention = _ref_string_default("backup_retention", args, "", 7)
+character = _ref_string_default("character", args)
 copy_tags =
   if args.key? :copy_tags
     _bool("copy_tags", args, true)
   else
     ""
   end
-cluster = _ref_string("cluster", args, "db cluster")
-instance_class = _ref_string("instance_class", args, "db instance classes")
-instance_class = _valid_values(instance_class, RDS_INSTANCE_CLASSES, RDS_DEFAULT_INSTANCE_CLASS) unless instance_class.is_a? Hash
+cluster = _ref_string_default("cluster", args, "db cluster")
+instance_class = _ref_string_default("instance_class", args, "db instance classes", RDS_DEFAULT_INSTANCE_CLASS)
+instance_class = _valid_values(instance_class, RDS_INSTANCE_CLASSES, RDS_DEFAULT_INSTANCE_CLASS) if instance_class.is_a? String
 instance_id = _ref_name("instance_id", args, "db instance id")
 db_name = _ref_string("db_name", args, "db name")
+db_name = _ref_string("database", args, "database") if _empty? db_name
 parameter = _ref_string("parameter", args, "db parameter group")
-parameter = "default.mysql5.7" if parameter.empty?
-security = _ref_array("security_groups", args, "security group")
-subnet_group = _ref_string("subnet_group", args, "db subnet group")
+# TODO support AWS::RDS::DBSecurityGroup
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html
+db_security_groups = _ref_array("db_security_groups", args, "db security group")
 snapshot = _ref_string("snapshot", args, "db snapshot")
-domain = args[:domain] || ""
-domain_iam = args[:domain_iam] || ""
-engine_version = _ref_string("engine_version", args, "db engine version")
-engine_version = RDS_DEFAULT_ENGINE_VERSION[engine.to_sym] if engine_version.empty?
-iops = args[:iops] || ""
+subnet = _ref_string("subnet", args, "db subnet group")
+domain = _ref_string("domain", args, "db domain")
+domain_iam = _ref_string("domain_iam", args, "db domain iam")
+# http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html
+engine = _valid_values(args[:engine],
+                       %w( aurora mariadb mysql
+                           oracle-ee oracle-se2 oracle-se1 oracle-se postgres
+                           sqlserver-ee sqlserver-se sqlserver-ex sqlserver-web ), RDS_DEFAULT_ENGINE)
+engine_version = _ref_string_default("engine_version", args, "db engine version", RDS_DEFAULT_ENGINE_VERSION[engine.to_sym])
+iops =
+  if _ref_key?("iops", args, "db iops")
+    _ref_string_default("iops", args, "db iops", 1000)
+  else
+    ""
+  end
+kms = _ref_attr_string("kms", "Arn", args)
+license = _valid_values(args[:license], %w( license-included bring-your-own-license general-public-license ), "general-public-license")
 user_name = _ref_string("user_name", args, "db master user name")
 user_password = _ref_string("user_password", args, "db master user password")
 multi_az = _bool("multi_az", args, false)
 option = _ref_string("option", args, "db option group")
-port = _ref_string("port", args, "db port")
-port = PORT[args[:engine]] if port.empty?
+port = _ref_string_default("port", args, "db port", PORT[engine.to_sym])
 backup_window = _window_time("rds", args[:backup_start] || DEFAULT_SNAPSHOT_TIME[:rds])
 maintenance = _maintenance_window("rds", args[:maintenance] || DEFAULT_MAINTENANCE_TIME[:rds])
 publicly = _bool("publicly", args, false)
-source_db = _ref_string("source_db", args, "db source db")
-storage_encrypted = _bool("encrypted", args, false)
+source_db = _ref_string("source_db", args, "db instance id")
+encrypted = _bool("encrypted", args, false)
 storage_type = _valid_values(args[:storage_type], %w( standard gp2 io1 ), "gp2")
 tags = _tags(args)
-timezone = args[:timezone] || ""
+timezone = _ref_string_default("timezone", args, "db timezone")
 security_groups = _ref_array("security_groups", args, "security group")
+## TODO use helper
+depends = _resource_name(args[:master_instance], "db instance") unless _empty? source_db
+
+allocated = "" unless _empty? cluster
+character = "" if engine =~ /aurora/
+parameter =
+  if _empty? parameter
+    if engine == "mysql" and engine_version =~ /5.7/
+      "default.mysql5.7"
+    elsif engine == "aurora" and engine_version =~ /5.6/
+      "default.aurora5.6"
+    elsif engine == "postgres" and engine_version =~ /9.4/
+      "default.postgres9.4"
+    elsif engine == "mariadb" and engine_version =~ /10.0/
+      "default.mariadb10.0"
+    else
+      nil
+    end
+  else
+    nil
+  end
+instance_id = instance_id.downcase if instance_id.is_a? String
+if engine !~ /sqlserver/
+  domain = ""
+  domain_iam = ""
+end
+db_name = "" unless _empty? snapshot
+iops = "" if storage_type != "io1"
+multi_az = false unless _empty? az
+source_db = "" if engine !~ /(mysql|mariadb|postgres)/
+unless _empty? source_db
+  multi_az = false
+  snapshot = ""
+  backup_retention = ""
+  db_name = ""
+  subnet = ""
+  user_name = ""
+  user_password = ""
+  backup_window = ""
+end
+encrypted = true unless _empty? kms
+if encrypted
+  cluster = ""
+  snapshot = ""
+  source_db = ""
+end
+security_groups = "" unless _empty? db_security_groups
+unless _empty? cluster
+  allocated = ""
+  backup_retention = ""
+  character = ""
+  db_security_groups = []
+  db_name = ""
+  subnet = ""
+  user_name = ""
+  user_password = ""
+  multi_az = ""
+  option = ""
+  backup_window = ""
+  maintenance = ""
+  port = ""
+  source_db = ""
+  security_groups = []
+  backup_window = ""
+  maintenance = ""
+  storage_type = ""
+end
 
 _(name) do
   Type "AWS::RDS::DBInstance"
   Properties do
-    AllocatedStorage allocated
+    AllocatedStorage allocated unless _empty? allocated
     AllowMajorVersionUpgrade allow
     AutoMinorVersionUpgrade auto
-    AvailabilityZone az unless multi_az
-    BackupRetentionPeriod backup_retention if 0 < backup_retention
-    CharacterSetName character if !character.empty? and engine =~ /^oracle.*$/
-    CopyTagsToSnapshot copy_tags unless copy_tags.empty?
-    DBClusterIdentifier cluster if engine == "aurora" and !cluster.empty?
+    AvailabilityZone az unless _empty? az
+    BackupRetentionPeriod backup_retention unless _empty? backup_retention
+    CharacterSetName character unless _empty? character
+    CopyTagsToSnapshot copy_tags unless _empty? copy_tags
+    DBClusterIdentifier cluster unless _empty? cluster
     DBInstanceClass instance_class
-    DBInstanceIdentifier instance_id
-    DBName db_name if snapshot.empty?
-    DBParameterGroupName parameter unless parameter.empty?
-    DBSecurityGroups security if security_groups.empty?
-    DBSnapshotIdentifier snapshot unless snapshot.empty?
-    DBSubnetGroupName subnet_group
-    Domain domain unless domain.empty? and engine !~ /sqlserver/
-    DomainIAMRoleName domain_iam unless domain_iam.empty? and engine !~ /sqlserver/
+    DBInstanceIdentifier instance_id unless _empty? instance_id
+    DBName db_name unless _empty? db_name
+    DBParameterGroupName parameter unless _empty? parameter
+    DBSecurityGroups db_security_groups unless _empty? db_security_groups
+    DBSnapshotIdentifier snapshot unless _empty? snapshot
+    DBSubnetGroupName subnet unless _empty? subnet
+    Domain domain unless _empty? domain
+    DomainIAMRoleName domain_iam unless _empty? domain_iam
     Engine engine
     EngineVersion engine_version
-    Iops iops unless iops.empty?
-    #KmsKeyId
-    #LicenseModel
-    MasterUsername user_name
-    MasterUserPassword user_password
-    MultiAZ multi_az
-    OptionGroupName option unless option.empty?
-    Port port
-    PreferredBackupWindow backup_window
-    PreferredMaintenanceWindow maintenance
+    Iops iops unless _empty? iops
+    KmsKeyId kms unless _empty? kms
+    LicenseModel license unless _empty? license
+    MasterUsername user_name unless _empty? user_name
+    MasterUserPassword user_password unless _empty? user_password
+    MultiAZ multi_az unless _empty? multi_az
+    OptionGroupName option unless _empty? option
+    Port port unless _empty? port
+    PreferredBackupWindow backup_window unless _empty? backup_window
+    PreferredMaintenanceWindow maintenance unless _empty? maintenance
     PubliclyAccessible publicly
-    SourceDBInstanceIdentifier source_db unless source_db.empty?
-    StorageEncrypted storage_encrypted if storage_encrypted == true
-    StorageType storage_type
+    SourceDBInstanceIdentifier source_db unless _empty? source_db
+    StorageEncrypted encrypted unless _empty? kms
+    StorageType storage_type unless _empty? storage_type
     Tags tags
-    Timezone timezone unless timezone.empty?
-    VPCSecurityGroups security_groups unless security_groups.empty?
+    Timezone timezone unless _empty? timezone
+    VPCSecurityGroups security_groups unless _empty? security_groups
   end
+  DependsOn depends unless _empty? depends
 end

data/test/helper_test.rb

@@ -56,6 +56,18 @@ EOS
     assert_equal description, "test description, test"
   end
 
+  def test_empty
+    assert_equal _empty?(nil), true
+    assert_equal _empty?(""), true
+    assert_equal _empty?("test"), false
+    assert_equal _empty?([]), true
+    assert_equal _empty?([ "test" ]), false
+    assert_equal _empty?(true), false
+    assert_equal _empty?(false), false
+    assert_equal _empty?({}), true
+    assert_equal _empty?({ test: "test" }), false
+  end
+
   def test_valid_values
     assert_equal _valid_values("test1", ["test1", "test2"]), "test1"
     assert_equal _valid_values("test3", ["test1", "test2"], "test1"), "test1"

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_group: "test", ref_user_name: "test", ref_user_password: "test", ref_security_groups: "test"
+_rds_db_cluster "test", ref_parameter: "test", ref_subnet: "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,6 +11,12 @@ _rds_db_cluster "test", ref_parameter: "test", ref_subnet_group: "test", ref_use
   "TestDbCluster": {
     "Type": "AWS::RDS::DBCluster",
     "Properties": {
+      "AvailabilityZone": {
+        "Fn::GetAtt": [
+          "TestSubnet",
+          "AvailabilityZone"
+        ]
+      },
       "BackupRetentionPeriod": "7",
       "DatabaseName": {
         "Fn::Join": [

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

@@ -3,7 +3,14 @@ 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_group: "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: "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
@@ -39,6 +46,7 @@ _rds_db_instance "test", ref_db_name: "test", ref_port: "test", ref_subnet_group
       },
       "Engine": "mysql",
       "EngineVersion": "5.7.17",
+      "LicenseModel": "general-public-license",
       "MasterUsername": {
         "Ref": "TestDbMasterUserName"
       },
@@ -88,6 +96,367 @@ _rds_db_instance "test", ref_db_name: "test", ref_port: "test", ref_subnet_group
       ]
     }
   }
+}
+    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",
+      "LicenseModel": "general-public-license",
+      "MasterUsername": {
+        "Ref": "TestDbMasterUserName"
+      },
+      "MasterUserPassword": {
+        "Ref": "TestDbMasterUserPassword"
+      },
+      "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",
+      "LicenseModel": "general-public-license",
+      "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",
+      "LicenseModel": "general-public-license",
+      "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",
+      "LicenseModel": "general-public-license",
+      "MasterUsername": {
+        "Ref": "TestDbMasterUserName"
+      },
+      "MasterUserPassword": {
+        "Ref": "TestDbMasterUserPassword"
+      },
+      "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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk