Use beta endpoint for shared vpc resources (#621)

Original Author: @leg100
hashicorp · Apr 23, 2019 · 1175d56 · 1175d56
1 parent 71a7aa6
commit 1175d56
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/google-beta/resource_compute_shared_vpc_host_project.go b/google-beta/resource_compute_shared_vpc_host_project.go
@@ -30,14 +30,14 @@ func resourceComputeSharedVpcHostProjectCreate(d *schema.ResourceData, meta inte
 	config := meta.(*Config)
 
 	hostProject := d.Get("project").(string)
-	op, err := config.clientCompute.Projects.EnableXpnHost(hostProject).Do()
+	op, err := config.clientComputeBeta.Projects.EnableXpnHost(hostProject).Do()
 	if err != nil {
 		return fmt.Errorf("Error enabling Shared VPC Host %q: %s", hostProject, err)
 	}
 
 	d.SetId(hostProject)
 
-	err = computeOperationWait(config.clientCompute, op, hostProject, "Enabling Shared VPC Host")
+	err = computeBetaOperationWaitTime(config.clientCompute, op, hostProject, "Enabling Shared VPC Host", int(d.Timeout(schema.TimeoutCreate).Minutes()))
 	if err != nil {
 		d.SetId("")
 		return err
@@ -51,7 +51,7 @@ func resourceComputeSharedVpcHostProjectRead(d *schema.ResourceData, meta interf
 
 	hostProject := d.Id()
 
-	project, err := config.clientCompute.Projects.Get(hostProject).Do()
+	project, err := config.clientComputeBeta.Projects.Get(hostProject).Do()
 	if err != nil {
 		return handleNotFoundError(err, d, fmt.Sprintf("Project data for project %q", hostProject))
 	}
@@ -70,12 +70,12 @@ func resourceComputeSharedVpcHostProjectDelete(d *schema.ResourceData, meta inte
 	config := meta.(*Config)
 	hostProject := d.Get("project").(string)
 
-	op, err := config.clientCompute.Projects.DisableXpnHost(hostProject).Do()
+	op, err := config.clientComputeBeta.Projects.DisableXpnHost(hostProject).Do()
 	if err != nil {
 		return fmt.Errorf("Error disabling Shared VPC Host %q: %s", hostProject, err)
 	}
 
-	err = computeOperationWait(config.clientCompute, op, hostProject, "Disabling Shared VPC Host")
+	err = computeBetaOperationWaitTime(config.clientCompute, op, hostProject, "Disabling Shared VPC Host", int(d.Timeout(schema.TimeoutCreate).Minutes()))
 	if err != nil {
 		return err
 	}

diff --git a/google-beta/resource_compute_shared_vpc_service_project.go b/google-beta/resource_compute_shared_vpc_service_project.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"google.golang.org/api/compute/v1"
+	computeBeta "google.golang.org/api/compute/v0.beta"
 
 	"log"
 
@@ -42,17 +42,18 @@ func resourceComputeSharedVpcServiceProjectCreate(d *schema.ResourceData, meta i
 	hostProject := d.Get("host_project").(string)
 	serviceProject := d.Get("service_project").(string)
 
-	req := &compute.ProjectsEnableXpnResourceRequest{
-		XpnResource: &compute.XpnResourceId{
+	req := &computeBeta.ProjectsEnableXpnResourceRequest{
+		XpnResource: &computeBeta.XpnResourceId{
 			Id:   serviceProject,
 			Type: "PROJECT",
 		},
 	}
-	op, err := config.clientCompute.Projects.EnableXpnResource(hostProject, req).Do()
+	op, err := config.clientComputeBeta.Projects.EnableXpnResource(hostProject, req).Do()
 	if err != nil {
 		return err
 	}
-	if err = computeOperationWait(config.clientCompute, op, hostProject, "Enabling Shared VPC Resource"); err != nil {
+	err = computeBetaOperationWaitTime(config.clientCompute, op, hostProject, "Enabling Shared VPC Resource", int(d.Timeout(schema.TimeoutCreate).Minutes()))
+	if err != nil {
 		return err
 	}
 
@@ -96,7 +97,7 @@ func resourceComputeSharedVpcServiceProjectDelete(d *schema.ResourceData, meta i
 	hostProject := d.Get("host_project").(string)
 	serviceProject := d.Get("service_project").(string)
 
-	if err := disableXpnResource(config, hostProject, serviceProject); err != nil {
+	if err := disableXpnResource(d, config, hostProject, serviceProject); err != nil {
 		// Don't fail if the service project is already disabled.
 		if !isDisabledXpnResourceError(err) {
 			return fmt.Errorf("Error disabling Shared VPC Resource %q: %s", serviceProject, err)
@@ -106,18 +107,19 @@ func resourceComputeSharedVpcServiceProjectDelete(d *schema.ResourceData, meta i
 	return nil
 }
 
-func disableXpnResource(config *Config, hostProject, project string) error {
-	req := &compute.ProjectsDisableXpnResourceRequest{
-		XpnResource: &compute.XpnResourceId{
+func disableXpnResource(d *schema.ResourceData, config *Config, hostProject, project string) error {
+	req := &computeBeta.ProjectsDisableXpnResourceRequest{
+		XpnResource: &computeBeta.XpnResourceId{
 			Id:   project,
 			Type: "PROJECT",
 		},
 	}
-	op, err := config.clientCompute.Projects.DisableXpnResource(hostProject, req).Do()
+	op, err := config.clientComputeBeta.Projects.DisableXpnResource(hostProject, req).Do()
 	if err != nil {
 		return err
 	}
-	if err = computeOperationWait(config.clientCompute, op, hostProject, "Disabling Shared VPC Resource"); err != nil {
+	err = computeBetaOperationWaitTime(config.clientCompute, op, hostProject, "Disabling Shared VPC Resource", int(d.Timeout(schema.TimeoutCreate).Minutes()))
+	if err != nil {
 		return err
 	}
 	return nil