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

azurerm_mssql_database - update nil validation for license_type #26850

Merged
merged 2 commits into from
Aug 13, 2024
Merged

azurerm_mssql_database - update nil validation for license_type #26850

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da839a
azurerm_mssql_database - update nil validation for license_type
neil-yechenwei Jul 29, 2024
ef17c85
not explicitly set license to nul
neil-yechenwei Aug 13, 2024
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
2 changes: 1 addition & 1 deletion internal/services/mssql/mssql_database_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ func resourceMsSqlDatabaseUpdate(d *pluginsdk.ResourceData, meta interface{}) er
// Determine whether the SKU is for SQL Data Warehouse
isDwSku := strings.HasPrefix(strings.ToLower(skuName), "dw")

if strings.HasPrefix(skuName, "GP_S_") && d.Get("license_type").(string) != "" {
if strings.HasPrefix(skuName, "GP_S_") && !pluginsdk.IsExplicitlyNullInConfig(d, "license_type") {
return fmt.Errorf("serverless databases do not support license type")
}

Expand Down
48 changes: 48 additions & 0 deletions internal/services/mssql/mssql_database_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,28 @@ func TestAccMsSqlDatabase_gpServerless(t *testing.T) {
})
}

func TestAccMsSqlDatabase_updateLicenseType(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_mssql_database", "test")
r := MsSqlDatabaseResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.gpWithLicenseType(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.gpServerlessWithNullLicenseType(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("license_type"),
})
}

func TestAccMsSqlDatabase_bc(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_mssql_database", "test")
r := MsSqlDatabaseResource{}
Expand Down Expand Up @@ -1226,6 +1248,32 @@ resource "azurerm_mssql_database" "test" {
`, r.template(data), data.RandomInteger)
}

func (r MsSqlDatabaseResource) gpWithLicenseType(data acceptance.TestData) string {
return fmt.Sprintf(`
%[1]s

resource "azurerm_mssql_database" "test" {
name = "acctest-db-%[2]d"
server_id = azurerm_mssql_server.test.id
sku_name = "GP_Gen5_2"
license_type = "LicenseIncluded"
}
`, r.template(data), data.RandomInteger)
}

func (r MsSqlDatabaseResource) gpServerlessWithNullLicenseType(data acceptance.TestData) string {
return fmt.Sprintf(`
%[1]s

resource "azurerm_mssql_database" "test" {
name = "acctest-db-%[2]d"
server_id = azurerm_mssql_server.test.id
sku_name = "GP_S_Gen5_2"
license_type = null
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Omitting this is equivalent to license_type = null. Could you please remove this instead of explicitly setting to null

Suggested change
license_type = null

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed it

}
`, r.template(data), data.RandomInteger)
}

func (r MsSqlDatabaseResource) hs(data acceptance.TestData) string {
return fmt.Sprintf(`
%[1]s
Expand Down
Loading