From 5874819e21fa16956ae31173c016c6c4d8bc5b80 Mon Sep 17 00:00:00 2001 From: Vincent Roseberry Date: Tue, 26 Sep 2017 14:02:15 -0700 Subject: [PATCH] Remove beta code path in compute_global_address --- google/resource_compute_global_address.go | 76 +++---------------- .../resource_compute_global_address_test.go | 43 ++--------- 2 files changed, 17 insertions(+), 102 deletions(-) diff --git a/google/resource_compute_global_address.go b/google/resource_compute_global_address.go index e0799289..efcfa465 100644 --- a/google/resource_compute_global_address.go +++ b/google/resource_compute_global_address.go @@ -7,13 +7,9 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/validation" - computeBeta "google.golang.org/api/compute/v0.beta" "google.golang.org/api/compute/v1" ) -var GlobalAddressBaseApiVersion = v1 -var GlobalAddressVersionedFeatures = []Feature{} - func resourceComputeGlobalAddress() *schema.Resource { return &schema.Resource{ Create: resourceComputeGlobalAddressCreate, @@ -57,7 +53,6 @@ func resourceComputeGlobalAddress() *schema.Resource { } func resourceComputeGlobalAddressCreate(d *schema.ResourceData, meta interface{}) error { - computeApiVersion := getComputeApiVersion(d, GlobalAddressBaseApiVersion, GlobalAddressVersionedFeatures) config := meta.(*Config) project, err := getProject(d, config) @@ -66,35 +61,14 @@ func resourceComputeGlobalAddressCreate(d *schema.ResourceData, meta interface{} } // Build the address parameter - addr := &computeBeta.Address{ + addr := &compute.Address{ Name: d.Get("name").(string), IpVersion: d.Get("ip_version").(string), } - var op interface{} - switch computeApiVersion { - case v1: - v1Addr := &compute.Address{} - err = Convert(addr, v1Addr) - if err != nil { - return err - } - - op, err = config.clientCompute.GlobalAddresses.Insert(project, v1Addr).Do() - if err != nil { - return fmt.Errorf("Error creating address: %s", err) - } - case v0beta: - v0BetaAddr := &computeBeta.Address{} - err = Convert(addr, v0BetaAddr) - if err != nil { - return err - } - - op, err = config.clientComputeBeta.GlobalAddresses.Insert(project, v0BetaAddr).Do() - if err != nil { - return fmt.Errorf("Error creating address: %s", err) - } + op, err := config.clientCompute.GlobalAddresses.Insert(project, addr).Do() + if err != nil { + return fmt.Errorf("Error creating address: %s", err) } // It probably maybe worked, so store the ID now @@ -109,7 +83,6 @@ func resourceComputeGlobalAddressCreate(d *schema.ResourceData, meta interface{} } func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) error { - computeApiVersion := getComputeApiVersion(d, GlobalAddressBaseApiVersion, GlobalAddressVersionedFeatures) config := meta.(*Config) project, err := getProject(d, config) @@ -117,28 +90,9 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) return err } - addr := &computeBeta.Address{} - switch computeApiVersion { - case v1: - v1Addr, err := config.clientCompute.GlobalAddresses.Get(project, d.Id()).Do() - if err != nil { - return handleNotFoundError(err, d, fmt.Sprintf("Global Address %q", d.Get("name").(string))) - } - - err = Convert(v1Addr, addr) - if err != nil { - return err - } - case v0beta: - v0BetaAddr, err := config.clientComputeBeta.GlobalAddresses.Get(project, d.Id()).Do() - if err != nil { - return handleNotFoundError(err, d, fmt.Sprintf("Global Address %q", d.Get("name").(string))) - } - - err = Convert(v0BetaAddr, addr) - if err != nil { - return err - } + addr, err := config.clientCompute.GlobalAddresses.Get(project, d.Id()).Do() + if err != nil { + return handleNotFoundError(err, d, fmt.Sprintf("Global Address %q", d.Get("name").(string))) } d.Set("name", addr.Name) @@ -150,7 +104,6 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) } func resourceComputeGlobalAddressDelete(d *schema.ResourceData, meta interface{}) error { - computeApiVersion := getComputeApiVersion(d, GlobalAddressBaseApiVersion, GlobalAddressVersionedFeatures) config := meta.(*Config) project, err := getProject(d, config) @@ -160,18 +113,9 @@ func resourceComputeGlobalAddressDelete(d *schema.ResourceData, meta interface{} // Delete the address log.Printf("[DEBUG] address delete request") - var op interface{} - switch computeApiVersion { - case v1: - op, err = config.clientCompute.GlobalAddresses.Delete(project, d.Id()).Do() - if err != nil { - return fmt.Errorf("Error deleting address: %s", err) - } - case v0beta: - op, err = config.clientComputeBeta.GlobalAddresses.Delete(project, d.Id()).Do() - if err != nil { - return fmt.Errorf("Error deleting address: %s", err) - } + op, err := config.clientCompute.GlobalAddresses.Delete(project, d.Id()).Do() + if err != nil { + return fmt.Errorf("Error deleting address: %s", err) } err = computeSharedOperationWait(config, op, project, "Deleting Global Address") diff --git a/google/resource_compute_global_address_test.go b/google/resource_compute_global_address_test.go index aa91748c..c3918ffa 100644 --- a/google/resource_compute_global_address_test.go +++ b/google/resource_compute_global_address_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - computeBeta "google.golang.org/api/compute/v0.beta" "google.golang.org/api/compute/v1" ) @@ -26,8 +25,8 @@ func TestAccComputeGlobalAddress_basic(t *testing.T) { testAccCheckComputeGlobalAddressExists( "google_compute_global_address.foobar", &addr), - // implicitly IPV4 - if we don't send an ip_version, we don't get one back even when using Beta apis - testAccCheckComputeBetaGlobalAddressIpVersion("google_compute_global_address.foobar", ""), + // implicitly IPV4 - if we don't send an ip_version, we don't get one back. + testAccCheckComputeGlobalAddressIpVersion("google_compute_global_address.foobar", ""), ), }, }, @@ -35,7 +34,7 @@ func TestAccComputeGlobalAddress_basic(t *testing.T) { } func TestAccComputeGlobalAddress_ipv6(t *testing.T) { - var addr computeBeta.Address + var addr compute.Address resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -45,9 +44,9 @@ func TestAccComputeGlobalAddress_ipv6(t *testing.T) { resource.TestStep{ Config: testAccComputeGlobalAddress_ipv6, Check: resource.ComposeTestCheckFunc( - testAccCheckComputeBetaGlobalAddressExists( + testAccCheckComputeGlobalAddressExists( "google_compute_global_address.foobar", &addr), - testAccCheckComputeBetaGlobalAddressIpVersion("google_compute_global_address.foobar", "IPV6"), + testAccCheckComputeGlobalAddressIpVersion("google_compute_global_address.foobar", "IPV6"), ), }, }, @@ -101,7 +100,7 @@ func testAccCheckComputeGlobalAddressExists(n string, addr *compute.Address) res } } -func testAccCheckComputeBetaGlobalAddressExists(n string, addr *computeBeta.Address) resource.TestCheckFunc { +func testAccCheckComputeGlobalAddressIpVersion(n, version string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -114,35 +113,7 @@ func testAccCheckComputeBetaGlobalAddressExists(n string, addr *computeBeta.Addr config := testAccProvider.Meta().(*Config) - found, err := config.clientComputeBeta.GlobalAddresses.Get(config.Project, rs.Primary.ID).Do() - if err != nil { - return err - } - - if found.Name != rs.Primary.ID { - return fmt.Errorf("Addr not found") - } - - *addr = *found - - return nil - } -} - -func testAccCheckComputeBetaGlobalAddressIpVersion(n, version string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[n] - if !ok { - return fmt.Errorf("Not found: %s", n) - } - - if rs.Primary.ID == "" { - return fmt.Errorf("No ID is set") - } - - config := testAccProvider.Meta().(*Config) - - addr, err := config.clientComputeBeta.GlobalAddresses.Get(config.Project, rs.Primary.ID).Do() + addr, err := config.clientCompute.GlobalAddresses.Get(config.Project, rs.Primary.ID).Do() if err != nil { return err }