Skip to content

Commit

Permalink
check if administrator_login is not nil (#28909)
Browse files Browse the repository at this point in the history
  • Loading branch information
stephybun authored and jackofallops committed Feb 28, 2025
1 parent bad1554 commit 38d9f5e
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions internal/services/mssql/mssql_server_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -761,17 +761,19 @@ func msSqlPasswordChangeWhenAADAuthOnly(ctx context.Context, d *pluginsdk.Resour

// msSqlAdministratorLoginPassword checks to make sure that one of `administrator_login_password_wo` or `administrator_login_password` is set when `administrator_login` is specified.
func msSqlAdministratorLoginPassword(ctx context.Context, d *pluginsdk.ResourceDiff, _ interface{}) (err error) {
adminLogin := d.GetRawConfig().AsValueMap()["administrator_login"]
if !adminLogin.IsNull() && adminLogin.AsString() != "" {
woAdminLoginPassword, err := pluginsdk.GetWriteOnlyFromDiff(d, "administrator_login_password_wo", cty.String)
if err != nil {
return err
}
adminLogin, ok := d.GetRawConfig().AsValueMap()["administrator_login"]
if ok {
if !adminLogin.IsNull() && adminLogin.AsString() != "" {
woAdminLoginPassword, err := pluginsdk.GetWriteOnlyFromDiff(d, "administrator_login_password_wo", cty.String)
if err != nil {
return err
}

password := d.GetRawConfig().AsValueMap()["administrator_login_password"]
password := d.GetRawConfig().AsValueMap()["administrator_login_password"]

if woAdminLoginPassword.IsNull() && password.IsNull() {
return fmt.Errorf("expected `administrator_login_password` or `administrator_login_password_wo` to be set when `administrator_login` is specified")
if woAdminLoginPassword.IsNull() && password.IsNull() {
return fmt.Errorf("expected `administrator_login_password` or `administrator_login_password_wo` to be set when `administrator_login` is specified")
}
}
}
return
Expand Down

0 comments on commit 38d9f5e

Please sign in to comment.