Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
emilymye committed Aug 5, 2019
1 parent 3839e54 commit 7dc7a3d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions third_party/terraform/resources/resource_google_folder.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func resourceGoogleFolder() *schema.Resource {
Delete: schema.DefaultTimeout(4 * time.Minute),
},


Schema: map[string]*schema.Schema{
// Format is either folders/{folder_id} or organizations/{org_id}.
"parent": {
Expand Down Expand Up @@ -202,7 +201,7 @@ func resourceGoogleFolderImportState(d *schema.ResourceData, m interface{}) ([]*

// Util to get a Folder resource from API. Note that folder described by name is not necessarily the
// ResourceData resource.
func getGoogleFolder(folderName string, d *schema.ResourceData, config *Config) (*resourceManagerV2Beta1.Folder, error){
func getGoogleFolder(folderName string, d *schema.ResourceData, config *Config) (*resourceManagerV2Beta1.Folder, error) {
var folder *resourceManagerV2Beta1.Folder
err := retryTimeDuration(func() error {
var reqErr error
Expand All @@ -213,4 +212,4 @@ func getGoogleFolder(folderName string, d *schema.ResourceData, config *Config)
return nil, err
}
return folder, nil
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func resourceGoogleFolderOrganizationPolicyDelete(d *schema.ResourceData, meta i
Constraint: canonicalOrgPolicyConstraint(d.Get("constraint").(string)),
}).Do()
return delErr
}, d.Timeout(schema.TimeoutDelete))
}, d.Timeout(schema.TimeoutDelete))
}

func setFolderOrganizationPolicy(d *schema.ResourceData, meta interface{}) error {
Expand Down Expand Up @@ -148,5 +148,5 @@ func setFolderOrganizationPolicy(d *schema.ResourceData, meta interface{}) error
},
}).Do()
return setErr
}, d.Timeout(schema.TimeoutCreate))
}, d.Timeout(schema.TimeoutCreate))
}

0 comments on commit 7dc7a3d

Please sign in to comment.