Skip to content

Commit

Permalink
Remove getZonalResourceFromRegion
Browse files Browse the repository at this point in the history
  • Loading branch information
rileykarson committed Dec 17, 2018
1 parent 6e48827 commit 71b2e07
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions third_party/terraform/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi"
)

Expand Down Expand Up @@ -62,30 +61,6 @@ func getProjectFromDiff(d *schema.ResourceDiff, config *Config) (string, error)
return "", fmt.Errorf("%s: required field is not set", "project")
}

func getZonalResourceFromRegion(getResource func(string) (interface{}, error), region string, compute *compute.Service, project string) (interface{}, error) {
zoneList, err := compute.Zones.List(project).Do()
if err != nil {
return nil, err
}
var resource interface{}
for _, zone := range zoneList.Items {
if strings.Contains(zone.Name, region) {
resource, err = getResource(zone.Name)
if err != nil {
if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
// Resource was not found in this zone
continue
}
return nil, fmt.Errorf("Error reading Resource: %s", err)
}
// Resource was found
return resource, nil
}
}
// Resource does not exist in this region
return nil, nil
}

func getRouterLockName(region string, router string) string {
return fmt.Sprintf("router/%s/%s", region, router)
}
Expand Down

0 comments on commit 71b2e07

Please sign in to comment.