diff --git a/aws-mssql.yml b/aws-mssql.yml index 72d7cee2b..94a3f966b 100644 --- a/aws-mssql.yml +++ b/aws-mssql.yml @@ -93,7 +93,6 @@ provision: details: | AWS DB instance class. Accepted values will depend on the selected engine and mssql_version. See: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_SQLServer.html#SQLServer.Concepts.General.InstanceClasses - default: "" - field_name: rds_subnet_group type: string details: AWS RDS subnet group already in existence to use diff --git a/integration-tests/mssql_test.go b/integration-tests/mssql_test.go index b98aae418..18eb5b37f 100644 --- a/integration-tests/mssql_test.go +++ b/integration-tests/mssql_test.go @@ -39,6 +39,8 @@ var _ = Describe("MSSQL", Label("MSSQL"), func() { "engine": "sqlserver-ee", "mssql_version": "some-mssql-version", "storage_gb": 20, + + "instance_class": "some-instance-class", } } diff --git a/terraform-tests/mssql_test.go b/terraform-tests/mssql_test.go index 8d1fb8387..4d2b7d297 100644 --- a/terraform-tests/mssql_test.go +++ b/terraform-tests/mssql_test.go @@ -29,7 +29,6 @@ var _ = Describe("mssql", Label("mssql-terraform"), Ordered, func() { "labels": map[string]string{"label1": "value1"}, "aws_vpc_id": "", - "instance_class": "", "rds_subnet_group": "", "rds_vpc_security_group_ids": "", } @@ -38,6 +37,8 @@ var _ = Describe("mssql", Label("mssql-terraform"), Ordered, func() { "engine": "sqlserver-ee", "mssql_version": "some-engine-version", "storage_gb": 20, + + "instance_class": "some-instance-class", } validVPC := awsVPCID @@ -71,7 +72,7 @@ var _ = Describe("mssql", Label("mssql-terraform"), Ordered, func() { "engine_version": Equal("some-engine-version"), "identifier": Equal("csb-mssql-test"), "storage_encrypted": BeTrue(), - "instance_class": Equal(""), + "instance_class": Equal("some-instance-class"), "tags": HaveKeyWithValue("label1", "value1"), "db_subnet_group_name": Equal("csb-mssql-test-p-sn"), "apply_immediately": BeTrue(), @@ -89,6 +90,7 @@ var _ = Describe("mssql", Label("mssql-terraform"), Ordered, func() { Expect(msgs).To(ContainSubstring(`The root module input variable \"mssql_version\" is not set, and has no default value.`)) Expect(msgs).To(ContainSubstring(`The root module input variable \"engine\" is not set, and has no default value.`)) Expect(msgs).To(ContainSubstring(`The root module input variable \"storage_gb\" is not set, and has no default value.`)) + Expect(msgs).To(ContainSubstring(`The root module input variable \"instance_class\" is not set, and has no default value.`)) }) })