remove switch statements between api versions for compute

Author: danawillow

google/api_versions.go

@@ -117,10 +117,6 @@ func getApiVersion(d TerraformResourceData, resourceVersion ApiVersion, features
 	return maxVersionFunc(versions)
 }
 
-func getComputeApiVersion(d TerraformResourceData, resourceVersion ApiVersion, features []Feature) ApiVersion {
-	return getApiVersion(d, resourceVersion, features, maxComputeVersion)
-}
-
 func getContainerApiVersion(d TerraformResourceData, resourceVersion ApiVersion, features []Feature) ApiVersion {
 	return getApiVersion(d, resourceVersion, features, maxContainerVersion)
 }
@@ -146,10 +142,6 @@ func getApiVersionUpdate(d TerraformResourceData, resourceVersion ApiVersion, fe
 	return maxVersionFunc(versions)
 }
 
-func getComputeApiVersionUpdate(d TerraformResourceData, resourceVersion ApiVersion, features, updateOnlyFields []Feature) ApiVersion {
-	return getApiVersionUpdate(d, resourceVersion, features, updateOnlyFields, maxComputeVersion)
-}
-
 func getContainerApiVersionUpdate(d TerraformResourceData, resourceVersion ApiVersion, features, updateOnlyFields []Feature) ApiVersion {
 	return getApiVersionUpdate(d, resourceVersion, features, updateOnlyFields, maxContainerVersion)
 }
@@ -245,10 +237,6 @@ func maxVersion(versionsInUse map[ApiVersion]struct{}, orderedVersions []ApiVers
 	return orderedVersions[len(orderedVersions)-1]
 }
 
-func maxComputeVersion(versionsInUse map[ApiVersion]struct{}) ApiVersion {
-	return maxVersion(versionsInUse, OrderedComputeApiVersions)
-}
-
 func maxContainerVersion(versionsInUse map[ApiVersion]struct{}) ApiVersion {
 	return maxVersion(versionsInUse, OrderedContainerApiVersions)
 }

google/data_source_google_compute_subnetwork.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform/helper/schema"
+	computeBeta "google.golang.org/api/compute/v0.beta"
 	"google.golang.org/api/compute/v1"
 )
 
@@ -123,3 +124,7 @@ func flattenSecondaryRanges(secondaryRanges []*compute.SubnetworkSecondaryRange)
 func createSubnetID(s *compute.Subnetwork) string {
 	return fmt.Sprintf("%s/%s", s.Region, s.Name)
 }
+
+func createSubnetIDBeta(s *computeBeta.Subnetwork) string {
+	return fmt.Sprintf("%s/%s", s.Region, s.Name)
+}

google/resource_compute_backend_service.go

@@ -12,9 +12,6 @@ import (
 	compute "google.golang.org/api/compute/v1"
 )
 
-var BackendServiceBaseApiVersion = v1
-var BackendServiceVersionedFeatures = []Feature{Feature{Version: v0beta, Item: "security_policy"}}
-
 func resourceComputeBackendService() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceComputeBackendServiceCreate,
@@ -288,33 +285,16 @@ func resourceComputeBackendServiceCreate(d *schema.ResourceData, meta interface{
 }
 
 func resourceComputeBackendServiceRead(d *schema.ResourceData, meta interface{}) error {
-	computeApiVersion := getComputeApiVersion(d, BackendServiceBaseApiVersion, BackendServiceVersionedFeatures)
 	config := meta.(*Config)
 
 	project, err := getProject(d, config)
 	if err != nil {
 		return err
 	}
 
-	service := &computeBeta.BackendService{}
-	switch computeApiVersion {
-	case v1:
-		v1Service, err := config.clientCompute.BackendServices.Get(
-			project, d.Id()).Do()
-		if err != nil {
-			return handleNotFoundError(err, d, fmt.Sprintf("Backend Service %q", d.Get("name").(string)))
-		}
-		err = Convert(v1Service, service)
-		if err != nil {
-			return err
-		}
-	case v0beta:
-		var err error
-		service, err = config.clientComputeBeta.BackendServices.Get(
-			project, d.Id()).Do()
-		if err != nil {
-			return handleNotFoundError(err, d, fmt.Sprintf("Backend Service %q", d.Get("name").(string)))
-		}
+	service, err := config.clientComputeBeta.BackendServices.Get(project, d.Id()).Do()
+	if err != nil {
+		return handleNotFoundError(err, d, fmt.Sprintf("Backend Service %q", d.Get("name").(string)))
 	}
 
 	d.Set("name", service.Name)

google/resource_compute_firewall.go

@@ -10,12 +10,8 @@ import (
 	"github.com/hashicorp/terraform/helper/validation"
 
 	computeBeta "google.golang.org/api/compute/v0.beta"
-	"google.golang.org/api/compute/v1"
 )
 
-var FirewallBaseApiVersion = v1
-var FirewallVersionedFeatures = []Feature{}
-
 func resourceComputeFirewall() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceComputeFirewallCreate,
@@ -193,7 +189,6 @@ func resourceComputeFirewallRuleHash(v interface{}) int {
 }
 
 func resourceComputeFirewallCreate(d *schema.ResourceData, meta interface{}) error {
-	computeApiVersion := getComputeApiVersion(d, FirewallBaseApiVersion, FirewallVersionedFeatures)
 	config := meta.(*Config)
 
 	project, err := getProject(d, config)
@@ -206,30 +201,9 @@ func resourceComputeFirewallCreate(d *schema.ResourceData, meta interface{}) err
 		return err
 	}
 
-	var op interface{}
-	switch computeApiVersion {
-	case v1:
-		firewallV1 := &compute.Firewall{}
-		err = Convert(firewall, firewallV1)
-		if err != nil {
-			return err
-		}
-
-		op, err = config.clientCompute.Firewalls.Insert(project, firewallV1).Do()
-		if err != nil {
-			return fmt.Errorf("Error creating firewall: %s", err)
-		}
-	case v0beta:
-		firewallV0Beta := &computeBeta.Firewall{}
-		err = Convert(firewall, firewallV0Beta)
-		if err != nil {
-			return err
-		}
-
-		op, err = config.clientComputeBeta.Firewalls.Insert(project, firewallV0Beta).Do()
-		if err != nil {
-			return fmt.Errorf("Error creating firewall: %s", err)
-		}
+	op, err := config.clientComputeBeta.Firewalls.Insert(project, firewall).Do()
+	if err != nil {
+		return fmt.Errorf("Error creating firewall: %s", err)
 	}
 
 	// It probably maybe worked, so store the ID now
@@ -268,36 +242,16 @@ func flattenFirewallDenied(denied []*computeBeta.FirewallDenied) []map[string]in
 }
 
 func resourceComputeFirewallRead(d *schema.ResourceData, meta interface{}) error {
-	computeApiVersion := getComputeApiVersion(d, FirewallBaseApiVersion, FirewallVersionedFeatures)
 	config := meta.(*Config)
 
 	project, err := getProject(d, config)
 	if err != nil {
 		return err
 	}
 
-	firewall := &computeBeta.Firewall{}
-	switch computeApiVersion {
-	case v1:
-		firewallV1, err := config.clientCompute.Firewalls.Get(project, d.Id()).Do()
-		if err != nil {
-			return handleNotFoundError(err, d, fmt.Sprintf("Firewall %q", d.Get("name").(string)))
-		}
-
-		err = Convert(firewallV1, firewall)
-		if err != nil {
-			return err
-		}
-	case v0beta:
-		firewallV0Beta, err := config.clientComputeBeta.Firewalls.Get(project, d.Id()).Do()
-		if err != nil {
-			return handleNotFoundError(err, d, fmt.Sprintf("Firewall %q", d.Get("name").(string)))
-		}
-
-		err = Convert(firewallV0Beta, firewall)
-		if err != nil {
-			return err
-		}
+	firewall, err := config.clientComputeBeta.Firewalls.Get(project, d.Id()).Do()
+	if err != nil {
+		return handleNotFoundError(err, d, fmt.Sprintf("Firewall %q", d.Get("name").(string)))
 	}
 
 	d.Set("self_link", ConvertSelfLinkToV1(firewall.SelfLink))
@@ -319,7 +273,6 @@ func resourceComputeFirewallRead(d *schema.ResourceData, meta interface{}) error
 }
 
 func resourceComputeFirewallUpdate(d *schema.ResourceData, meta interface{}) error {
-	computeApiVersion := getComputeApiVersionUpdate(d, FirewallBaseApiVersion, FirewallVersionedFeatures, []Feature{})
 	config := meta.(*Config)
 
 	project, err := getProject(d, config)
@@ -334,30 +287,9 @@ func resourceComputeFirewallUpdate(d *schema.ResourceData, meta interface{}) err
 		return err
 	}
 
-	var op interface{}
-	switch computeApiVersion {
-	case v1:
-		firewallV1 := &compute.Firewall{}
-		err = Convert(firewall, firewallV1)
-		if err != nil {
-			return err
-		}
-
-		op, err = config.clientCompute.Firewalls.Update(project, d.Id(), firewallV1).Do()
-		if err != nil {
-			return fmt.Errorf("Error updating firewall: %s", err)
-		}
-	case v0beta:
-		firewallV0Beta := &computeBeta.Firewall{}
-		err = Convert(firewall, firewallV0Beta)
-		if err != nil {
-			return err
-		}
-
-		op, err = config.clientComputeBeta.Firewalls.Update(project, d.Id(), firewallV0Beta).Do()
-		if err != nil {
-			return fmt.Errorf("Error updating firewall: %s", err)
-		}
+	op, err := config.clientComputeBeta.Firewalls.Update(project, d.Id(), firewall).Do()
+	if err != nil {
+		return fmt.Errorf("Error updating firewall: %s", err)
 	}
 
 	err = computeSharedOperationWait(config.clientCompute, op, project, "Updating Firewall")
@@ -371,7 +303,6 @@ func resourceComputeFirewallUpdate(d *schema.ResourceData, meta interface{}) err
 }
 
 func resourceComputeFirewallDelete(d *schema.ResourceData, meta interface{}) error {
-	computeApiVersion := getComputeApiVersion(d, FirewallBaseApiVersion, FirewallVersionedFeatures)
 	config := meta.(*Config)
 
 	project, err := getProject(d, config)
@@ -380,18 +311,9 @@ func resourceComputeFirewallDelete(d *schema.ResourceData, meta interface{}) err
 	}
 
 	// Delete the firewall
-	var op interface{}
-	switch computeApiVersion {
-	case v1:
-		op, err = config.clientCompute.Firewalls.Delete(project, d.Id()).Do()
-		if err != nil {
-			return fmt.Errorf("Error deleting firewall: %s", err)
-		}
-	case v0beta:
-		op, err = config.clientComputeBeta.Firewalls.Delete(project, d.Id()).Do()
-		if err != nil {
-			return fmt.Errorf("Error deleting firewall: %s", err)
-		}
+	op, err := config.clientComputeBeta.Firewalls.Delete(project, d.Id()).Do()
+	if err != nil {
+		return fmt.Errorf("Error deleting firewall: %s", err)
 	}
 
 	err = computeSharedOperationWait(config.clientCompute, op, project, "Deleting Firewall")