Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [MSSQL] instance_class have useless default #1067

Merged
merged 2 commits into from
Aug 10, 2023
Merged

fix: [MSSQL] instance_class have useless default #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cc3993
fix: [MSSQL] instance_class have useless default
fnaranjo-vmw Aug 9, 2023
0524634
Merge branch 'main' into fix-mssql-instance-class-useless-default-#18…
zucchinidev Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion aws-mssql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/mssql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
}

Expand Down
6 changes: 4 additions & 2 deletions terraform-tests/mssql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
}
Expand All @@ -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
Expand Down Expand Up @@ -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(),
Expand All @@ -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.`))
})
})

Expand Down