Skip to content

azurerm_mysql_flexible_server - fix a panic #29225

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

Merged
catriona-m merged 2 commits into from
Mar 31, 2025
Merged

azurerm_mysql_flexible_server - fix a panic #29225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9842cd3
remove utils
catriona-m Mar 31, 2025
40c38ce
fix crash
catriona-m Mar 31, 2025
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
43 changes: 21 additions & 22 deletions internal/services/mysql/mysql_flexible_server_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)

const (
Expand Down Expand Up @@ -421,23 +420,23 @@ func resourceMysqlFlexibleServerCreate(d *pluginsdk.ResourceData, meta interface
}

if v, ok := d.GetOk("administrator_login"); ok && v.(string) != "" {
parameters.Properties.AdministratorLogin = utils.String(v.(string))
parameters.Properties.AdministratorLogin = pointer.To(v.(string))
}

if v, ok := d.GetOk("administrator_password"); ok && v.(string) != "" {
parameters.Properties.AdministratorLoginPassword = utils.String(v.(string))
parameters.Properties.AdministratorLoginPassword = pointer.To(v.(string))
}

if !woPassword.IsNull() {
parameters.Properties.AdministratorLoginPassword = pointer.To(woPassword.AsString())
}

if v, ok := d.GetOk("zone"); ok && v.(string) != "" {
parameters.Properties.AvailabilityZone = utils.String(v.(string))
parameters.Properties.AvailabilityZone = pointer.To(v.(string))
}

if v, ok := d.GetOk("source_server_id"); ok && v.(string) != "" {
parameters.Properties.SourceServerResourceId = utils.String(v.(string))
parameters.Properties.SourceServerResourceId = pointer.To(v.(string))
}

pointInTimeUTC := d.Get("point_in_time_restore_time_in_utc").(string)
Expand Down Expand Up @@ -701,7 +700,7 @@ func resourceMysqlFlexibleServerUpdate(d *pluginsdk.ResourceData, meta interface
}

if d.HasChange("administrator_password") {
parameters.Properties.AdministratorLoginPassword = utils.String(d.Get("administrator_password").(string))
parameters.Properties.AdministratorLoginPassword = pointer.To(d.Get("administrator_password").(string))
}

if d.HasChange("administrator_password_wo_version") {
Expand Down Expand Up @@ -786,11 +785,11 @@ func expandArmServerNetwork(d *pluginsdk.ResourceData) *servers.Network {
network := servers.Network{}

if v, ok := d.GetOk("delegated_subnet_id"); ok {
network.DelegatedSubnetResourceId = utils.String(v.(string))
network.DelegatedSubnetResourceId = pointer.To(v.(string))
}

if v, ok := d.GetOk("private_dns_zone_id"); ok {
network.PrivateDnsZoneResourceId = utils.String(v.(string))
network.PrivateDnsZoneResourceId = pointer.To(v.(string))
}

return &network
Expand All @@ -799,16 +798,16 @@ func expandArmServerNetwork(d *pluginsdk.ResourceData) *servers.Network {
func expandArmServerMaintenanceWindow(input []interface{}) *servers.MaintenanceWindow {
if len(input) == 0 {
return &servers.MaintenanceWindow{
CustomWindow: utils.String(ServerMaintenanceWindowDisabled),
CustomWindow: pointer.To(ServerMaintenanceWindowDisabled),
}
}
v := input[0].(map[string]interface{})

maintenanceWindow := servers.MaintenanceWindow{
CustomWindow: utils.String(ServerMaintenanceWindowEnabled),
StartHour: utils.Int64(int64(v["start_hour"].(int))),
StartMinute: utils.Int64(int64(v["start_minute"].(int))),
DayOfWeek: utils.Int64(int64(v["day_of_week"].(int))),
CustomWindow: pointer.To(ServerMaintenanceWindowEnabled),
StartHour: pointer.To(int64(v["start_hour"].(int))),
StartMinute: pointer.To(int64(v["start_minute"].(int))),
DayOfWeek: pointer.To(int64(v["day_of_week"].(int))),
}

return &maintenanceWindow
Expand Down Expand Up @@ -836,11 +835,11 @@ func expandArmServerStorage(inputs []interface{}) *servers.Storage {
}

if v := input["size_gb"].(int); v != 0 {
storage.StorageSizeGB = utils.Int64(int64(v))
storage.StorageSizeGB = pointer.To(int64(v))
}

if v := input["iops"].(int); v != 0 {
storage.Iops = utils.Int64(int64(v))
storage.Iops = pointer.To(int64(v))
}

return &storage
Expand Down Expand Up @@ -881,7 +880,7 @@ func expandArmServerBackup(d *pluginsdk.ResourceData) *servers.Backup {
}

if v, ok := d.GetOk("backup_retention_days"); ok {
backup.BackupRetentionDays = utils.Int64(int64(v.(int)))
backup.BackupRetentionDays = pointer.To(int64(v.(int)))
}

return &backup
Expand Down Expand Up @@ -980,7 +979,7 @@ func expandFlexibleServerHighAvailability(inputs []interface{}) *servers.HighAva
}

if v, ok := input["standby_availability_zone"]; ok && v.(string) != "" {
result.StandbyAvailabilityZone = utils.String(v.(string))
result.StandbyAvailabilityZone = pointer.To(v.(string))
}

return &result
Expand All @@ -1005,7 +1004,7 @@ func flattenFlexibleServerHighAvailability(ha *servers.HighAvailability) []inter
}

func expandFlexibleServerDataEncryption(input []interface{}) *servers.DataEncryption {
if len(input) == 0 {
if len(input) == 0 || input[0] == nil {
det := servers.DataEncryptionTypeSystemManaged
return &servers.DataEncryption{
Type: &det,
Expand All @@ -1019,19 +1018,19 @@ func expandFlexibleServerDataEncryption(input []interface{}) *servers.DataEncryp
}

if keyVaultKeyId := v["key_vault_key_id"].(string); keyVaultKeyId != "" {
dataEncryption.PrimaryKeyURI = utils.String(keyVaultKeyId)
dataEncryption.PrimaryKeyURI = pointer.To(keyVaultKeyId)
}

if primaryUserAssignedIdentityId := v["primary_user_assigned_identity_id"].(string); primaryUserAssignedIdentityId != "" {
dataEncryption.PrimaryUserAssignedIdentityId = utils.String(primaryUserAssignedIdentityId)
dataEncryption.PrimaryUserAssignedIdentityId = pointer.To(primaryUserAssignedIdentityId)
}

if geoBackupKeyVaultKeyId := v["geo_backup_key_vault_key_id"].(string); geoBackupKeyVaultKeyId != "" {
dataEncryption.GeoBackupKeyURI = utils.String(geoBackupKeyVaultKeyId)
dataEncryption.GeoBackupKeyURI = pointer.To(geoBackupKeyVaultKeyId)
}

if geoBackupUserAssignedIdentityId := v["geo_backup_user_assigned_identity_id"].(string); geoBackupUserAssignedIdentityId != "" {
dataEncryption.GeoBackupUserAssignedIdentityId = utils.String(geoBackupUserAssignedIdentityId)
dataEncryption.GeoBackupUserAssignedIdentityId = pointer.To(geoBackupUserAssignedIdentityId)
}

return &dataEncryption
Expand Down
Loading