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_postgresql_flexible_server - fix acctest for authentication #19800

Merged
merged 4 commits into from
Jan 3, 2023
Merged

azurerm_postgresql_flexible_server - fix acctest for authentication #19800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38468c8
workaround for auth config in postgresql flexible server
ziyeqf Dec 28, 2022
d7c6439
Merge branch 'main' into tengzh/acctest/postgres_aad
ziyeqf Dec 28, 2022
7226639
golint
ziyeqf Dec 28, 2022
784d851
make generate
ziyeqf Dec 28, 2022
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
31 changes: 24 additions & 7 deletions internal/services/postgres/postgresql_flexible_server_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,22 +349,39 @@ func resourcePostgresqlFlexibleServerCreate(d *pluginsdk.ResourceData, meta inte
parameters.Properties.PointInTimeUTC = utils.String(v.Format(time.RFC3339))
}

// if create with `password_auth_enabled` set to `false`, the service will not accept `administrator_login`.
// so we create it with `password_auth_enabled` set to `true`, then set it to `false` in an additional update.
if authRaw, ok := d.GetOk("authentication"); ok {
parameters.Properties.AuthConfig = expandFlexibleServerAuthConfig(authRaw.([]interface{}))
authConfig := expandFlexibleServerAuthConfig(authRaw.([]interface{}))
authConfig.PasswordAuthEnabled = utils.Bool(true)
parameters.Properties.AuthConfig = authConfig
}

if err = client.CreateThenPoll(ctx, id, parameters); err != nil {
return fmt.Errorf("creating %s: %+v", id, err)
}

requireAdditionalUpdate := false
updateProperties := servers.ServerPropertiesForUpdate{}
if authRaw, ok := d.GetOk("authentication"); ok {
authConfig := expandFlexibleServerAuthConfig(authRaw.([]interface{}))
if !*authConfig.PasswordAuthEnabled {
requireAdditionalUpdate = true
updateProperties.AuthConfig = authConfig
}
}

// `maintenance_window` could only be updated with, could not be created with
if v, ok := d.GetOk("maintenance_window"); ok {
mwParams := servers.ServerForUpdate{
Properties: &servers.ServerPropertiesForUpdate{
MaintenanceWindow: expandArmServerMaintenanceWindow(v.([]interface{})),
},
requireAdditionalUpdate = true
updateProperties.MaintenanceWindow = expandArmServerMaintenanceWindow(v.([]interface{}))
}

if requireAdditionalUpdate {
update := servers.ServerForUpdate{
Properties: &updateProperties,
}
if err = client.UpdateThenPoll(ctx, id, mwParams); err != nil {
if err = client.UpdateThenPoll(ctx, id, update); err != nil {
return fmt.Errorf("updating %s: %+v", id, err)
}
}
Expand Down Expand Up @@ -401,7 +418,7 @@ func resourcePostgresqlFlexibleServerRead(d *pluginsdk.ResourceData, meta interf
d.Set("location", location.NormalizeNilable(&model.Location))

if props := model.Properties; props != nil {
d.Set("administrator_login", props.AdministratorLogin)
d.Set("administrator_login", props.AdministratorLogin) // if pwdEnabled is set to false, then the service does not return the value of AdministratorLogin
d.Set("zone", props.AvailabilityZone)
d.Set("version", props.Version)
d.Set("fqdn", props.FullyQualifiedDomainName)
Expand Down
3 changes: 2 additions & 1 deletion website/allowed-subcategories
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,5 @@ Synapse
Template
Time Series Insights
VMware (AVS)
Video Analyzer
Video Analyzer
Web PubSub