Skip to content

Commit 3a35e02

Browse files
sql: fix nil pointer while importing google_sql_database and remove invalid import_format (#14428) (#23643)
[upstream:3f84e8b3354b9260bbf67621bd6bb94162227310] Signed-off-by: Modular Magician <[email protected]>
1 parent 33e49c1 commit 3a35e02

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.changelog/14428.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:bug
2+
sql: fixed a provider crash when importing `google_sql_database` resource
3+
```
4+
5+
```release-note:note
6+
sql: removed the invalid import format `{{name}}` for `google_sql_database` resource
7+
```

google/services/sql/resource_sql_database.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ func resourceSQLDatabaseRead(d *schema.ResourceData, meta interface{}) error {
241241
if err != nil {
242242
return err
243243
}
244-
if databaseInstance.Settings.ActivationPolicy != "ALWAYS" {
244+
if databaseInstance.Settings != nil && databaseInstance.Settings.ActivationPolicy != "ALWAYS" {
245245
return nil
246246
}
247247
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
@@ -449,7 +449,6 @@ func resourceSQLDatabaseImport(d *schema.ResourceData, meta interface{}) ([]*sch
449449
"^instances/(?P<instance>[^/]+)/databases/(?P<name>[^/]+)$",
450450
"^(?P<project>[^/]+)/(?P<instance>[^/]+)/(?P<name>[^/]+)$",
451451
"^(?P<instance>[^/]+)/(?P<name>[^/]+)$",
452-
"^(?P<name>[^/]+)$",
453452
}, d, config); err != nil {
454453
return nil, err
455454
}

website/docs/r/sql_database.html.markdown

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ Database can be imported using any of these accepted formats:
149149
* `instances/{{instance}}/databases/{{name}}`
150150
* `{{project}}/{{instance}}/{{name}}`
151151
* `{{instance}}/{{name}}`
152-
* `{{name}}`
153152

154153

155154
In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Database using one of the formats above. For example:
@@ -168,7 +167,6 @@ $ terraform import google_sql_database.default projects/{{project}}/instances/{{
168167
$ terraform import google_sql_database.default instances/{{instance}}/databases/{{name}}
169168
$ terraform import google_sql_database.default {{project}}/{{instance}}/{{name}}
170169
$ terraform import google_sql_database.default {{instance}}/{{name}}
171-
$ terraform import google_sql_database.default {{name}}
172170
```
173171

174172
## User Project Overrides

0 commit comments

Comments
 (0)