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

Remove unnecessary Exists methods (#1032)

Browse Source 
* Remove unnecessary
exists method

* make fmt

* Remove unused import
This commit is contained in:
Vincent Roseberry 2018-02-02 13:04:22 -08:00 committed by GitHub
parent cfac1dbc8b
commit 9d59f5f93a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
google/resource_compute_region_instance_group_manager.go
View File

@ -9,7 +9,6 @@ import (
"fmt"
computeBeta "google.golang.org/api/compute/v0.beta"
"google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi"
"time"
)
@ -22,7 +21,6 @@ func resourceComputeRegionInstanceGroupManager() *schema.Resource {
Read: resourceComputeRegionInstanceGroupManagerRead,
Update: resourceComputeRegionInstanceGroupManagerUpdate,
Delete: resourceComputeRegionInstanceGroupManagerDelete,
Exists: resourceComputeRegionInstanceGroupManagerExists,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
@ -511,32 +509,3 @@ func resourceComputeRegionInstanceGroupManagerDelete(d *schema.ResourceData, met
d.SetId("")
return nil
}
func resourceComputeRegionInstanceGroupManagerExists(d *schema.ResourceData, meta interface{}) (bool, error) {
computeApiVersion := getComputeApiVersion(d, RegionInstanceGroupManagerBaseApiVersion, RegionInstanceGroupManagerVersionedFeatures)
config := meta.(*Config)
project, err := getProject(d, config)
if err != nil {
return false, err
}
region := d.Get("region").(string)
switch computeApiVersion {
case v1:
_, err = config.clientCompute.RegionInstanceGroupManagers.Get(project, region, d.Id()).Do()
case v0beta:
_, err = config.clientComputeBeta.RegionInstanceGroupManagers.Get(project, region, d.Id()).Do()
}
if err != nil {
if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
return false, nil
}
// There was some other error in reading the resource but we can't say for sure if it doesn't exist.
return true, err
}
return true, nil
}

24
google/resource_compute_snapshot.go
View File

@ -14,7 +14,6 @@ func resourceComputeSnapshot() *schema.Resource {
Create: resourceComputeSnapshotCreate,
Read: resourceComputeSnapshotRead,
Delete: resourceComputeSnapshotDelete,
Exists: resourceComputeSnapshotExists,
Update: resourceComputeSnapshotUpdate,
Schema: map[string]*schema.Schema{
@ -246,29 +245,6 @@ func resourceComputeSnapshotDelete(d *schema.ResourceData, meta interface{}) err
return nil
}
func resourceComputeSnapshotExists(d *schema.ResourceData, meta interface{}) (bool, error) {
config := meta.(*Config)
project, err := getProject(d, config)
if err != nil {
return false, err
}
_, err = config.clientCompute.Snapshots.Get(
project, d.Id()).Do()
if err != nil {
if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
log.Printf("[WARN] Removing Snapshot %q because it's gone", d.Get("name").(string))
// The resource doesn't exist anymore
d.SetId("")
return false, err
}
return true, err
}
return true, nil
}
func updateLabels(client *compute.Service, project string, resourceId string, labels map[string]string, labelFingerprint string) error {
setLabelsReq := compute.GlobalSetLabelsRequest{
Labels: labels,