Skip to content

Migrate google_compute_shared_vpc_host_project.go file to use direct HTTP rather than a client library #18457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nsamartsev wants to merge 1 commit into
base: main
Choose a base branch
from
+51 −13
Draft

Migrate google_compute_shared_vpc_host_project.go file to use direct HTTP rather than a client library #18457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_host_project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,21 @@ func resourceComputeSharedVpcHostProjectCreate(d *schema.ResourceData, meta inte
}

hostProject := d.Get("project").(string)
op, err := NewClient(config, userAgent).Projects.EnableXpnHost(hostProject).Do()
url := fmt.Sprintf("%sprojects/%s/enableXpnHost", transport_tpg.BaseUrl(Product, config), hostProject)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "POST",
Project: hostProject,
RawURL: url,
UserAgent: userAgent,
})
if err != nil {
return fmt.Errorf("Error enabling Shared VPC Host %q: %s", hostProject, err)
}

d.SetId(hostProject)

err = ComputeOperationWaitTime(config, op, hostProject, "Enabling Shared VPC Host", userAgent, d.Timeout(schema.TimeoutCreate))
err = ComputeOperationWaitTime(config, res, hostProject, "Enabling Shared VPC Host", userAgent, d.Timeout(schema.TimeoutCreate))
if err != nil {
d.SetId("")
return err
Expand All @@ -79,12 +86,19 @@ func resourceComputeSharedVpcHostProjectRead(d *schema.ResourceData, meta interf

hostProject := d.Id()

project, err := NewClient(config, userAgent).Projects.Get(hostProject).Do()
url := fmt.Sprintf("%sprojects/%s", transport_tpg.BaseUrl(Product, config), hostProject)
project, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: hostProject,
RawURL: url,
UserAgent: userAgent,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("Project data for project %q", hostProject))
}

if project.XpnProjectStatus != "HOST" {
if project["xpnProjectStatus"] != "HOST" {
log.Printf("[WARN] Removing Shared VPC host resource %q because it's not enabled server-side", hostProject)
d.SetId("")
}
Expand Down Expand Up @@ -124,12 +138,19 @@ func resourceComputeSharedVpcHostProjectDelete(d *schema.ResourceData, meta inte

hostProject := d.Get("project").(string)

op, err := NewClient(config, userAgent).Projects.DisableXpnHost(hostProject).Do()
url := fmt.Sprintf("%sprojects/%s/disableXpnHost", transport_tpg.BaseUrl(Product, config), hostProject)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "POST",
Project: hostProject,
RawURL: url,
UserAgent: userAgent,
})
if err != nil {
return fmt.Errorf("Error disabling Shared VPC Host %q: %s", hostProject, err)
}

err = ComputeOperationWaitTime(config, op, hostProject, "Disabling Shared VPC Host", userAgent, d.Timeout(schema.TimeoutDelete))
err = ComputeOperationWaitTime(config, res, hostProject, "Disabling Shared VPC Host", userAgent, d.Timeout(schema.TimeoutDelete))
if err != nil {
return err
}
Expand Down
31 changes: 24 additions & 7 deletions mmv1/third_party/terraform/services/compute/resource_compute_shared_vpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-provider-google/google/envvar"
"github.com/hashicorp/terraform-provider-google/google/services/compute"
_ "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager"
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
)

func TestAccComputeSharedVpc_basic(t *testing.T) {
Expand Down Expand Up @@ -79,17 +80,25 @@ func testAccCheckComputeSharedVpcHostProject(t *testing.T, hostProject string, e
return func(s *terraform.State) error {
config := acctest.GoogleProviderConfig(t)

found, err := compute.NewClient(config, config.UserAgent).Projects.Get(hostProject).Do()
url := fmt.Sprintf("%sprojects/%s", transport_tpg.BaseUrl(compute.Product, config), hostProject)
found, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: hostProject,
RawURL: url,
UserAgent: config.UserAgent,
})
if err != nil {
return fmt.Errorf("Error reading project %s: %s", hostProject, err)
}

if found.Name != hostProject {
if found["name"].(string) != hostProject {
return fmt.Errorf("Project %s not found", hostProject)
}

if enabled != (found.XpnProjectStatus == "HOST") {
return fmt.Errorf("Project %q shared VPC status was not expected, got %q", hostProject, found.XpnProjectStatus)
xpnProjectStatus, _ := found["xpnProjectStatus"].(string)
if enabled != (xpnProjectStatus == "HOST") {
return fmt.Errorf("Project %q shared VPC status was not expected, got %q", hostProject, xpnProjectStatus)
}

return nil
Expand All @@ -99,16 +108,24 @@ func testAccCheckComputeSharedVpcHostProject(t *testing.T, hostProject string, e
func testAccCheckComputeSharedVpcServiceProject(t *testing.T, hostProject, serviceProject string, enabled bool) resource.TestCheckFunc {
return func(s *terraform.State) error {
config := acctest.GoogleProviderConfig(t)
serviceHostProject, err := compute.NewClient(config, config.UserAgent).Projects.GetXpnHost(serviceProject).Do()
url := fmt.Sprintf("%sprojects/%s/getXpnHost", transport_tpg.BaseUrl(compute.Product, config), serviceProject)
serviceHostProject, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: serviceProject,
RawURL: url,
UserAgent: config.UserAgent,
})
if err != nil {
if enabled {
return fmt.Errorf("Expected service project to be enabled.")
}
return nil
}

if enabled != (serviceHostProject.Name == hostProject) {
return fmt.Errorf("Wrong host project for the given service project. Expected '%s', got '%s'", hostProject, serviceHostProject.Name)
serviceHostProjectName, _ := serviceHostProject["name"].(string)
if enabled != (serviceHostProjectName == hostProject) {
return fmt.Errorf("Wrong host project for the given service project. Expected '%s', got '%s'", hostProject, serviceHostProjectName)
}

return nil
Expand Down
Loading