Skip to content

Commit acaf767

Browse files
emilymyedanawillow
authored andcommitted
Fix panic on empty maintenance window (#1507)
* fix maintenance window panic * tiny cleanup
1 parent 54e85c9 commit acaf767

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

google/resource_sql_database_instance.go

+15-12
Original file line numberDiff line numberDiff line change
@@ -569,21 +569,24 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
569569
}
570570
}
571571

572-
if v, ok := _settings["maintenance_window"]; ok && len(v.([]interface{})) > 0 {
573-
settings.MaintenanceWindow = &sqladmin.MaintenanceWindow{}
574-
_maintenanceWindow := v.([]interface{})[0].(map[string]interface{})
572+
if v, ok := _settings["maintenance_window"]; ok {
573+
windows := v.([]interface{})
574+
if len(windows) > 0 && windows[0] != nil {
575+
settings.MaintenanceWindow = &sqladmin.MaintenanceWindow{}
576+
window := windows[0].(map[string]interface{})
575577

576-
if vp, okp := _maintenanceWindow["day"]; okp {
577-
settings.MaintenanceWindow.Day = int64(vp.(int))
578-
}
578+
if vp, okp := window["day"]; okp {
579+
settings.MaintenanceWindow.Day = int64(vp.(int))
580+
}
579581

580-
if vp, okp := _maintenanceWindow["hour"]; okp {
581-
settings.MaintenanceWindow.Hour = int64(vp.(int))
582-
}
582+
if vp, okp := window["hour"]; okp {
583+
settings.MaintenanceWindow.Hour = int64(vp.(int))
584+
}
583585

584-
if vp, ok := _maintenanceWindow["update_track"]; ok {
585-
if len(vp.(string)) > 0 {
586-
settings.MaintenanceWindow.UpdateTrack = vp.(string)
586+
if vp, ok := window["update_track"]; ok {
587+
if len(vp.(string)) > 0 {
588+
settings.MaintenanceWindow.UpdateTrack = vp.(string)
589+
}
587590
}
588591
}
589592
}

0 commit comments

Comments
 (0)