Add import for `google_sql_database_instance` #11

gh-mlfowler · 2017-06-12T20:22:29Z

Previously raised as hashicorp/terraform#15235.

$ make testacc TESTARGS='-run=TestAccGoogleSqlDatabaseInstance_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test $(go list ./... |grep -v 'vendor') -v -run=TestAccGoogleSqlDatabaseInstance_ -timeout 120m
?       github.com/terraform-providers/terraform-provider-google        [no test files]
=== RUN   TestAccGoogleSqlDatabaseInstance_importBasic
--- PASS: TestAccGoogleSqlDatabaseInstance_importBasic (62.66s)
=== RUN   TestAccGoogleSqlDatabaseInstance_importBasic3
--- PASS: TestAccGoogleSqlDatabaseInstance_importBasic3 (299.44s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic
--- PASS: TestAccGoogleSqlDatabaseInstance_basic (52.04s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic2
--- PASS: TestAccGoogleSqlDatabaseInstance_basic2 (63.26s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic3
--- PASS: TestAccGoogleSqlDatabaseInstance_basic3 (300.31s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_basic
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_basic (42.03s)
=== RUN   TestAccGoogleSqlDatabaseInstance_slave
--- PASS: TestAccGoogleSqlDatabaseInstance_slave (702.61s)
=== RUN   TestAccGoogleSqlDatabaseInstance_diskspecs
--- PASS: TestAccGoogleSqlDatabaseInstance_diskspecs (301.20s)
=== RUN   TestAccGoogleSqlDatabaseInstance_maintenance
--- PASS: TestAccGoogleSqlDatabaseInstance_maintenance (436.09s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_upgrade
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_upgrade (59.18s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_downgrade
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_downgrade (48.40s)
=== RUN   TestAccGoogleSqlDatabaseInstance_authNets
--- PASS: TestAccGoogleSqlDatabaseInstance_authNets (75.18s)
=== RUN   TestAccGoogleSqlDatabaseInstance_multipleOperations
--- PASS: TestAccGoogleSqlDatabaseInstance_multipleOperations (79.44s)
PASS
ok      github.com/terraform-providers/terraform-provider-google/google 2521.860s```

rileykarson

Nice work! This is a big/old file, thanks for tackling it. I left a few comments for you to look over.

rileykarson · 2017-06-16T21:30:29Z

google/resource_sql_database_instance.go

@@ -630,6 +634,11 @@ func resourceSqlDatabaseInstanceRead(d *schema.ResourceData, meta interface{}) e
 		return err
 	}

+	// In the import case name won't be set yet


Instead of setting name here, let's use d.Id() in the Get below, and d.Set name using the Name property of instance later. That way, both refresh and import run through the same code

I've had to add a d.setId to the Create as the resource relied on it being set at the end of the first Read.

rileykarson · 2017-06-16T21:40:37Z

google/resource_sql_database_instance.go

+	} else {
+		_settingsList = make([]interface{}, 1)
+		_settings = make(map[string]interface{})
+		d.Set("region", instance.Region)


We should perform this d.Set in every Read instead of only during imports; this file was written as if Terraform was a non-authoritative tool, but our current standard is to make it one.

rileykarson · 2017-06-16T21:50:23Z

google/resource_sql_database_instance.go

+	if len(_settingsList) > 0 {
+		_settings = _settingsList[0].(map[string]interface{})
+	} else {
+		_settingsList = make([]interface{}, 1)


Do we read _settingsList anywhere after this? I don't think we need this line.

Yes, at the end of the Read, https://github.com/gh-mlfowler/terraform-provider-google/blob/245bf4359c166b683eda35b81881fab076cccc34/google/resource_sql_database_instance.go#L850-L851

It looks like when we use the _settingsList slice down there, we are just overwriting it's contents with the _settings object. We can introduce a new slice to wrap _settings in there, and better semantically show that the two slices are not linked. That way, we can eliminate this line and break an implicit dependency between these parts of the function.

I have made the amendments, please let me know if I understood correctly.

rileykarson · 2017-06-16T21:51:46Z

website/docs/r/sql_database_instance.html.markdown

+Database instances can be imported using the `name`, e.g.
+
+```
+$ terraform import google_sql_database_instance.instance instance_name


Replace with this to match the import statement with the resource in the example:

$ terraform import google_sql_database_instance.master master-instance

gh-mlfowler · 2017-06-20T22:20:48Z

Thanks for the review @rileykarson, I have made your suggested amendments.

==> Checking that code complies with gofmt requirements...                                                                                       
TF_ACC=1 go test $(go list ./... |grep -v 'vendor') -v -run=TestAccGoogleSqlDatabaseInstance_ -timeout 120m                                      
?       github.com/terraform-providers/terraform-provider-google        [no test files]                                                          
=== RUN   TestAccGoogleSqlDatabaseInstance_importBasic                                                                                           
--- PASS: TestAccGoogleSqlDatabaseInstance_importBasic (61.91s)                                                                                  
=== RUN   TestAccGoogleSqlDatabaseInstance_importBasic3                                                                                          
--- PASS: TestAccGoogleSqlDatabaseInstance_importBasic3 (382.40s)                                                                                
=== RUN   TestAccGoogleSqlDatabaseInstance_basic                                                                                                 
--- PASS: TestAccGoogleSqlDatabaseInstance_basic (51.22s)                                                                                        
=== RUN   TestAccGoogleSqlDatabaseInstance_basic2                                                                                                
--- PASS: TestAccGoogleSqlDatabaseInstance_basic2 (51.78s)                                                                                       
=== RUN   TestAccGoogleSqlDatabaseInstance_basic3                                                                                                
--- PASS: TestAccGoogleSqlDatabaseInstance_basic3 (434.49s)                                                                                      
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_basic                                                                                        
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_basic (41.80s)                                                                               
=== RUN   TestAccGoogleSqlDatabaseInstance_slave                                                                                                 
--- PASS: TestAccGoogleSqlDatabaseInstance_slave (744.54s)                                                                                       
=== RUN   TestAccGoogleSqlDatabaseInstance_diskspecs                                                                                             
--- PASS: TestAccGoogleSqlDatabaseInstance_diskspecs (429.58s)                                                                                   
=== RUN   TestAccGoogleSqlDatabaseInstance_maintenance                                                                                           
--- PASS: TestAccGoogleSqlDatabaseInstance_maintenance (396.00s)                                                                                 
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_upgrade                                                                                      
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_upgrade (73.19s)                                                                             
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_downgrade                                                                                    
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_downgrade (62.82s)                                                                           
=== RUN   TestAccGoogleSqlDatabaseInstance_authNets                                                                                              
--- PASS: TestAccGoogleSqlDatabaseInstance_authNets (88.65s)                                                                                     
=== RUN   TestAccGoogleSqlDatabaseInstance_multipleOperations                                                                                    
--- PASS: TestAccGoogleSqlDatabaseInstance_multipleOperations (94.58s)                                                                           
PASS                                                                                                                                             
ok      github.com/terraform-providers/terraform-provider-google/google 2912.964s   ```

gh-mlfowler · 2017-06-21T09:31:27Z

==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test $(go list ./... |grep -v 'vendor') -v -run=TestAccGoogleSqlDatabaseInstance_ -timeout 120m
?       github.com/terraform-providers/terraform-provider-google        [no test files]
=== RUN   TestAccGoogleSqlDatabaseInstance_importBasic
--- PASS: TestAccGoogleSqlDatabaseInstance_importBasic (50.59s)
=== RUN   TestAccGoogleSqlDatabaseInstance_importBasic3
--- PASS: TestAccGoogleSqlDatabaseInstance_importBasic3 (389.04s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic
--- PASS: TestAccGoogleSqlDatabaseInstance_basic (50.72s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic2
--- PASS: TestAccGoogleSqlDatabaseInstance_basic2 (49.15s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic3
--- PASS: TestAccGoogleSqlDatabaseInstance_basic3 (368.82s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_basic
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_basic (40.48s)
=== RUN   TestAccGoogleSqlDatabaseInstance_slave
--- PASS: TestAccGoogleSqlDatabaseInstance_slave (758.15s)
=== RUN   TestAccGoogleSqlDatabaseInstance_diskspecs
--- PASS: TestAccGoogleSqlDatabaseInstance_diskspecs (377.73s)
=== RUN   TestAccGoogleSqlDatabaseInstance_maintenance
--- PASS: TestAccGoogleSqlDatabaseInstance_maintenance (469.70s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_upgrade
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_upgrade (68.62s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_downgrade
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_downgrade (47.40s)
=== RUN   TestAccGoogleSqlDatabaseInstance_authNets
--- PASS: TestAccGoogleSqlDatabaseInstance_authNets (74.59s)
=== RUN   TestAccGoogleSqlDatabaseInstance_multipleOperations
--- PASS: TestAccGoogleSqlDatabaseInstance_multipleOperations (87.62s)
PASS
ok      github.com/terraform-providers/terraform-provider-google/google 2832.630s```

rileykarson · 2017-06-22T17:23:14Z

LGTM - thanks for the great work on this @gh-mlfowler!

TF_ACC=1 go test ./google -v -run=TestAccGoogleSqlDatabaseInstance_ -timeout 120m
=== RUN   TestAccGoogleSqlDatabaseInstance_importBasic
--- PASS: TestAccGoogleSqlDatabaseInstance_importBasic (59.14s)
=== RUN   TestAccGoogleSqlDatabaseInstance_importBasic3
--- PASS: TestAccGoogleSqlDatabaseInstance_importBasic3 (454.68s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic
--- PASS: TestAccGoogleSqlDatabaseInstance_basic (59.49s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic2
--- PASS: TestAccGoogleSqlDatabaseInstance_basic2 (57.87s)
=== RUN   TestAccGoogleSqlDatabaseInstance_basic3
--- PASS: TestAccGoogleSqlDatabaseInstance_basic3 (375.44s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_basic
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_basic (37.98s)
=== RUN   TestAccGoogleSqlDatabaseInstance_slave
--- PASS: TestAccGoogleSqlDatabaseInstance_slave (831.64s)
=== RUN   TestAccGoogleSqlDatabaseInstance_diskspecs
--- PASS: TestAccGoogleSqlDatabaseInstance_diskspecs (352.84s)
=== RUN   TestAccGoogleSqlDatabaseInstance_maintenance
--- PASS: TestAccGoogleSqlDatabaseInstance_maintenance (393.30s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_upgrade
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_upgrade (55.26s)
=== RUN   TestAccGoogleSqlDatabaseInstance_settings_downgrade
--- PASS: TestAccGoogleSqlDatabaseInstance_settings_downgrade (45.28s)
=== RUN   TestAccGoogleSqlDatabaseInstance_authNets
--- PASS: TestAccGoogleSqlDatabaseInstance_authNets (60.85s)
=== RUN   TestAccGoogleSqlDatabaseInstance_multipleOperations
--- PASS: TestAccGoogleSqlDatabaseInstance_multipleOperations (83.13s)
PASS
ok  	github.com/terraform-providers/terraform-provider-google/google	2867.086s

@danawillow

Add `google_sql_database` and `google_sql_database_instance` to Importability page. @danawillow hashicorp/terraform-provider-google#11 hashicorp/terraform-provider-google#12

@danawillow

Add `google_sql_database` and `google_sql_database_instance` to Importability page. @danawillow hashicorp/terraform-provider-google#11 hashicorp/terraform-provider-google#12

* Add import for `google_sql_database_instance` * Alterations suggested by review * Move declaration of array for clarification

ghost · 2020-03-31T14:16:03Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 [email protected]. Thanks!

Add import for google_sql_database_instance

f22d55f

gh-mlfowler mentioned this pull request Jun 12, 2017

Add import for google_sql_database_instance hashicorp/terraform#15235

Closed

rileykarson added the enhancement label Jun 14, 2017

rileykarson requested changes Jun 16, 2017

View reviewed changes

Alterations suggested by review

245bf43

Move declaration of array for clarification

e6fd0e9

rileykarson approved these changes Jun 22, 2017

View reviewed changes

rileykarson merged commit 58a6b3f into hashicorp:master Jun 22, 2017

This was referenced Jun 22, 2017

provider/google: SQL Database Importability hashicorp/terraform#15372

Merged

resource google_sql_database_instance doesn't support import #109

Closed

chrisst referenced this pull request in chrisst/terraform-provider-google Nov 9, 2018

Add import for google_sql_database_instance (#11)

95b0c97

* Add import for `google_sql_database_instance` * Alterations suggested by review * Move declaration of array for clarification

joeslazaro mentioned this pull request Mar 26, 2019

google_service_networking_connection error: Cannot modify allocated ranges in CreateConnection. Please use UpdateConnection #3294

Closed

ghost locked and limited conversation to collaborators Mar 31, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add import for `google_sql_database_instance` #11

Add import for `google_sql_database_instance` #11

gh-mlfowler commented Jun 12, 2017

rileykarson left a comment

rileykarson Jun 16, 2017

gh-mlfowler Jun 20, 2017

rileykarson Jun 16, 2017

rileykarson Jun 16, 2017

gh-mlfowler Jun 20, 2017

rileykarson Jun 21, 2017

gh-mlfowler Jun 21, 2017

rileykarson Jun 16, 2017

gh-mlfowler commented Jun 20, 2017

gh-mlfowler commented Jun 21, 2017

rileykarson commented Jun 22, 2017

ghost commented Mar 31, 2020

Add import for google_sql_database_instance #11

Add import for google_sql_database_instance #11

Conversation

gh-mlfowler commented Jun 12, 2017

rileykarson left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gh-mlfowler commented Jun 20, 2017

gh-mlfowler commented Jun 21, 2017

rileykarson commented Jun 22, 2017

ghost commented Mar 31, 2020

Add import for `google_sql_database_instance` #11

Add import for `google_sql_database_instance` #11