public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-10-01 16:21:06 +00:00
Code Issues Projects Releases Wiki Activity

Bump timeouts - users are still experiencing failures. (#1381)

Browse Source
This commit is contained in:
Nathan McKinley 2018-04-25 12:24:52 -07:00 committed by GitHub
parent 2b1b668953
commit 7e5ce3f679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/resource_sql_database_instance.go
View File

@ -695,7 +695,7 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
err = retryTime(func() error {
users, err = config.clientSqlAdmin.Users.List(project, instance.Name).Do()
return err
}, 3)
}, 5)
if err != nil {
return fmt.Errorf("Error, attempting to list users associated with instance %s: %s", instance.Name, err)
}

4
google/resource_sql_user.go
View File

@ -115,10 +115,10 @@ func resourceSqlUserRead(d *schema.ResourceData, meta interface{}) error {
var users *sqladmin.UsersListResponse
err = nil
err = retry(func() error {
err = retryTime(func() error {
users, err = config.clientSqlAdmin.Users.List(project, instance).Do()
return err
})
}, 5)
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("SQL User %q in instance %q", name, instance))
}