Add 'google_compute_shared_vpc_service_project_association' resource #453

ewbankkit · 2017-09-23T22:24:05Z

Fixes #452.
Add a google_compute_shared_vpc_service_project_association resource which allows associating a service project with a Shared VPC host project.
Acceptance test:

make testacc TEST=./google/  TESTARGS='-run=TestAccComputeSharedVpcServiceProjectAssociation_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./google/ -v -run=TestAccComputeSharedVpcServiceProjectAssociation_ -timeout 120m
=== RUN   TestAccComputeSharedVpcServiceProjectAssociation_basic
--- PASS: TestAccComputeSharedVpcServiceProjectAssociation_basic (135.58s)
PASS
ok  	github.com/terraform-providers/terraform-provider-google/google	135.586s

ewbankkit · 2017-09-23T22:31:44Z

google/resource_compute_shared_vpc.go

@@ -150,7 +147,16 @@ func resourceComputeSharedVpcDelete(d *schema.ResourceData, meta interface{}) er
 	return nil
 }

-func enableResource(config *Config, hostProject, project string) error {
+func isDisabledXpnResourceError(err error) bool {


Added isDisabledXpnResourceError() otherwise resource deletion (esp. for the Shared VPC resource) fails when attempting to disable an already disabled service project:

2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: HTTP/2.0 400 Bad Request 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: Alt-Svc: quic=":443"; ma=2592000; v="39,38,37,35" 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: Cache-Control: private, max-age=0 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: Content-Type: application/json; charset=UTF-8 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: Date: Sat, 23 Sep 2017 21:37:26 GMT 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: Expires: Sat, 23 Sep 2017 21:37:26 GMT 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: Server: GSE 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: Vary: Origin 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: Vary: X-Origin 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: X-Content-Type-Options: nosniff 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: X-Frame-Options: SAMEORIGIN 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: X-Xss-Protection: 1; mode=block 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: { 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: "error": { 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: "errors": [ 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: { 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: "domain": "global", 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: "reason": "invalidResourceUsage", 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: "message": "Invalid resource usage: 'The resource 'projects/test-service4-id' is not linked to shared VPC host 'projects/test-host4-id'.'." 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: } 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: ], 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: "code": 400, 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: "message": "Invalid resource usage: 'The resource 'projects/test-service4-id' is not linked to shared VPC host 'projects/test-host4-id'.'." 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: } 2017-09-23T17:37:26.228-0400 [DEBUG] plugin.terraform-provider-google: }

ewbankkit · 2017-09-23T22:32:49Z

google/resource_compute_shared_vpc.go

 	}

-	serviceProjects := []string{}


Replaced this code with new function findXpnResources().

ewbankkit · 2017-09-23T22:33:40Z

google/resource_compute_shared_vpc.go

@@ -106,7 +101,7 @@ func resourceComputeSharedVpcUpdate(d *schema.ResourceData, meta interface{}) er
 		for project, _ := range oldMap {
 			if _, ok := newMap[project]; !ok {
 				// The project is in the old config but not the new one, disable it
-				if err := disableResource(config, hostProject, project); err != nil {


Renamed disableResource to disableXpnResource.

ewbankkit · 2017-09-23T22:33:54Z

google/resource_compute_shared_vpc.go

@@ -115,7 +110,7 @@ func resourceComputeSharedVpcUpdate(d *schema.ResourceData, meta interface{}) er
 		for project, _ := range newMap {
 			if _, ok := oldMap[project]; !ok {
 				// The project is in the new config but not the old one, enable it
-				if err := enableResource(config, hostProject, project); err != nil {


Renamed enableResource to enableXpnResource.

ewbankkit · 2017-09-23T22:34:22Z

google/resource_compute_shared_vpc.go

@@ -74,19 +76,12 @@ func resourceComputeSharedVpcRead(d *schema.ResourceData, meta interface{}) erro
 	if project.XpnProjectStatus != "HOST" {
 		log.Printf("[WARN] Removing Shared VPC host resource %q because it's not enabled server-side", hostProject)
 		d.SetId("")
+		return nil


Bug fix 😄.

ewbankkit · 2017-09-23T22:35:55Z

google/resource_compute_shared_vpc.go

@@ -26,6 +27,7 @@ func resourceComputeSharedVpc() *schema.Resource {
 			"service_projects": &schema.Schema{
 				Type:     schema.TypeSet,
 				Optional: true,
+				Computed: true,


service_projects becomes Computed as these IDs can also be managed by google_compute_shared_vpc_service_project_association resources.

ewbankkit · 2017-10-11T12:29:38Z

It looks like this PR is obsoleted by the changes in #572.

rosbo · 2017-10-11T17:48:57Z

To avoid having two different ways of setting up a shared VPC that can lead to indeterministic behavior if used at the same time, we decided to have one resource to enable the host project and one resource to enable each service project. We decided not to include a resource to setup both in the same resource to avoid the confusion described above.

Thanks for this PR, I used bits of it to handle errors case properly in #572.

ghost · 2020-03-30T14:30:30Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 hashibot-feedback@hashicorp.com. Thanks!

ewbankkit added 2 commits September 23, 2017 18:14

Add 'google_compute_shared_vpc_service_project_association' resource.

bd3d60e

Documentation changes.

d621e27

ewbankkit commented Sep 23, 2017

View reviewed changes

radeksimko added the new-resource label Oct 8, 2017

rosbo mentioned this pull request Oct 11, 2017

Add support for shared VPC #572

Merged

rosbo closed this Oct 11, 2017

ewbankkit deleted the issue-452 branch October 11, 2017 17:50

ghost locked and limited conversation to collaborators Mar 30, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add 'google_compute_shared_vpc_service_project_association' resource #453

Add 'google_compute_shared_vpc_service_project_association' resource #453

ewbankkit commented Sep 23, 2017

ewbankkit Sep 23, 2017

ewbankkit Sep 23, 2017 •

edited

Loading

ewbankkit Sep 23, 2017

ewbankkit Sep 23, 2017

ewbankkit Sep 23, 2017

ewbankkit Sep 23, 2017

ewbankkit commented Oct 11, 2017

rosbo commented Oct 11, 2017

ghost commented Mar 30, 2020

Add 'google_compute_shared_vpc_service_project_association' resource #453

Add 'google_compute_shared_vpc_service_project_association' resource #453

Conversation

ewbankkit commented Sep 23, 2017

ewbankkit Sep 23, 2017

Choose a reason for hiding this comment

ewbankkit Sep 23, 2017 • edited Loading

Choose a reason for hiding this comment

ewbankkit Sep 23, 2017

Choose a reason for hiding this comment

ewbankkit Sep 23, 2017

Choose a reason for hiding this comment

ewbankkit Sep 23, 2017

Choose a reason for hiding this comment

ewbankkit Sep 23, 2017

Choose a reason for hiding this comment

ewbankkit commented Oct 11, 2017

rosbo commented Oct 11, 2017

ghost commented Mar 30, 2020

ewbankkit Sep 23, 2017 •

edited

Loading