Folder support: Assign/Reassign a google project to a folder. #438

srivasta · 2017-09-15T17:08:28Z

This branch addresses terraform-provider-google issue #411

srivasta · 2017-09-15T18:18:50Z

@rosbo I don't have enough rights to actually assign reviewers. I re-rebased, and resolved all new conflicts

Note: Pull request authors can't request reviews unless they are either a repository owner or collaborator with write access to the repository.

rosbo

Very good PR. Just a few comments that should be easy enough to address. Thanks!

rosbo · 2017-09-18T15:10:19Z

google/resource_google_project.go

+			"folder_id": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,


If you specify a folder, you should not be able to specify an org. To make sure it fails at
the terraform plan step, add ConflictsWith: []string{"org_id"} in the schema definition for the folder_id field. And vice-versa

rosbo · 2017-09-18T15:13:38Z

google/resource_google_project.go

-		d.Set("org_id", p.Parent.Id)
+		switch p.Parent.Type {
+		case "organization":
+			d.Set("org_id", p.Parent.Id)


add d.Set("folder_id", "") here. and the same for the `org_id field in the folder case below. The reason is that if you move a project from a folder to an org outside of Terraform, we want Terraform to clear the other field when reading the state.

rosbo · 2017-09-18T15:15:42Z

google/resource_google_project.go

+
+	// Project parent has changed
+	if d.HasChange("org_id") || d.HasChange("folder_id") {
+		if v, ok := d.GetOk("org_id"); ok {


Consider extracting line 239-253 in a getParentResourceId (or something along these lines) and reuse it for update and create.

rosbo · 2017-09-18T15:17:47Z

website/docs/r/google_project.html.markdown

-    Changing this forces a new project to be created.
+    Changing this forces a new project to be created.  If the `org_id`
+    is specified, but not the `folder_id`, then the project is created
+    at the top level. If both are specified, `org_id` is ignored.


If you add the ConflictsWith I suggested earlier, you can update this comment to say that folder_id or org_id can be specified but not both.

srivasta · 2017-09-19T06:21:51Z

Done. Made all the changes requested. I also squashed the commits in this branch, since intermediate points were not interesting, and will give a cleaner history on the mainline.

+ Make the org_id optional when creating a project. Closes hashicorp#131 + Mark org_id as computed to allow for GCP automatically assigning the org. + Add an acceptance test for project creation without an organization. + Skip TestAccGoogleProject_createWithoutOrg if GOOGLE_ORG is set. + Add a folder_id to the google_project resource, optionally specifying the ID of the GCP folder in which the GCP project should live. + Document how one can provision a project into a folder, and added a sample configuration to create a project into an existing folder. Based on work by ubschmidt2 on branch https://github.com/ubschmidt2/terraform-provider-google/commits/folder Signed-off-by: Manoj Srivastava <[email protected]>

rosbo · 2017-09-21T18:33:34Z

google/resource_google_project_test.go

@@ -24,15 +24,42 @@ var (
 	originalPolicy *cloudresourcemanager.Policy
 )

+// Test that a Project resource can be created without an organization
+func TestAccGoogleProject_createWithoutOrg(t *testing.T) {


We run our acceptance tests using a service account (not user credentials). Unfortunately, a service account belongs to an org and therefor, cannot create a project without a parent organization.

One solution: we could add a skip if a service account is used. This means we could run it locally but they wouldn't be ran by our CI server.

@paddycarver Any other solutions for this? Running user credentials for the CI server? Not sure it is safe/worth it.

I added logic to skip the test if a service account is used. @paddycarver if you have a better suggestion, we can fix it in a separate PR.

I'm late to the party here--sorry, I was out of office on Thursday--but IIRC we were talking about the possibility of getting the service account our CI runs with whitelisted for creating a project without a parent organisation, though I've lost track of where that discussion landed or what its current status is. That's my preferred solution, honestly, but we can follow up on this with a more permanent fix in a separate PR.

rosbo · 2017-09-21T18:34:44Z

google/resource_google_project_test.go

+		},
+	})
+}
+


Now that you can create folders, you can add acceptance tests for assigning a project to a folder and moving a project from a folder to an org and vice versa. Since you will be on vacation, I can also take care of writing the new tests. LMK what you prefer.

That sounds great. I won't have time for this till middle of next month, and so it would be great if you could add the tests with folder creation and movement between folders. I'll circle back in case you don't have time in the next couple of weeks

Oki. I will write these tests today. Thanks!

…orp#438) + Make the org_id optional when creating a project. Closes hashicorp#131 + Mark org_id as computed to allow for GCP automatically assigning the org. + Add an acceptance test for project creation without an organization. + Skip TestAccGoogleProject_createWithoutOrg if GOOGLE_ORG is set. + Add a folder_id to the google_project resource, optionally specifying the ID of the GCP folder in which the GCP project should live. + Document how one can provision a project into a folder, and added a sample configuration to create a project into an existing folder. * Skip test without org if service account is used * Support folders/* or id only for the folder id field

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

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 👉 [email protected]. Thanks!

srivasta changed the title ~~Folder support~~ Folder support: Assign/Reassign a google project to a folder. Sep 15, 2017

srivasta force-pushed the folder-support branch from 747bbd3 to 69160ed Compare September 15, 2017 18:04

srivasta mentioned this pull request Sep 16, 2017

Assign/Reassign a google project to a folder. #411

Closed

rosbo self-requested a review September 18, 2017 15:08

rosbo suggested changes Sep 18, 2017

View reviewed changes

srivasta force-pushed the folder-support branch from cb5145d to 2f0bb84 Compare September 19, 2017 06:14

srivasta force-pushed the folder-support branch from 2f0bb84 to d8bba77 Compare September 19, 2017 06:26

srivasta force-pushed the folder-support branch from d8bba77 to e8a11c1 Compare September 19, 2017 06:37

rosbo reviewed Sep 21, 2017

View reviewed changes

Skip if service account is used

59d2316

rosbo approved these changes Sep 22, 2017

View reviewed changes

rosbo added 2 commits September 22, 2017 11:01

Improve doc example

7cf31f3

Support folders/* or id only for the folder id field

d5f67bc

rosbo merged commit c1d0e71 into hashicorp:master Sep 22, 2017

rosbo mentioned this pull request Sep 25, 2017

Make the org_id optional when creating a project. #136

Closed

ghost locked and limited conversation to collaborators Mar 30, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Folder support: Assign/Reassign a google project to a folder. #438

Folder support: Assign/Reassign a google project to a folder. #438

srivasta commented Sep 15, 2017

srivasta commented Sep 15, 2017 •

edited

Loading

rosbo left a comment

rosbo Sep 18, 2017

srivasta Sep 19, 2017

rosbo Sep 18, 2017

srivasta Sep 19, 2017 •

edited

Loading

rosbo Sep 18, 2017

srivasta Sep 19, 2017

rosbo Sep 18, 2017

srivasta Sep 19, 2017

srivasta commented Sep 19, 2017 •

edited

Loading

rosbo Sep 21, 2017

rosbo Sep 22, 2017

paddycarver Sep 25, 2017

rosbo Sep 21, 2017

srivasta Sep 21, 2017

rosbo Sep 22, 2017

ghost commented Mar 30, 2020

Folder support: Assign/Reassign a google project to a folder. #438

Folder support: Assign/Reassign a google project to a folder. #438

Conversation

srivasta commented Sep 15, 2017

srivasta commented Sep 15, 2017 • edited Loading

rosbo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

srivasta Sep 19, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

srivasta commented Sep 19, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Mar 30, 2020

srivasta commented Sep 15, 2017 •

edited

Loading

srivasta Sep 19, 2017 •

edited

Loading

srivasta commented Sep 19, 2017 •

edited

Loading