Skip to content

Commit 428794d

Browse files
check for nil (#5816) (#4123)
Signed-off-by: Modular Magician <[email protected]>
1 parent 9d055ef commit 428794d

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

.changelog/5816.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
sql: fixed crash when one of `settings.database_flags` is nil.
3+
```

google-beta/resource_sql_database_instance.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,9 @@ func expandAuthorizedNetworks(configured []interface{}) []*sqladmin.AclEntry {
10671067
func expandDatabaseFlags(configured []interface{}) []*sqladmin.DatabaseFlags {
10681068
databaseFlags := make([]*sqladmin.DatabaseFlags, 0, len(configured))
10691069
for _, _flag := range configured {
1070+
if _flag == nil {
1071+
continue
1072+
}
10701073
_entry := _flag.(map[string]interface{})
10711074

10721075
databaseFlags = append(databaseFlags, &sqladmin.DatabaseFlags{

0 commit comments

Comments
 (0)