HCE-339 feat multi project #454

JolisaBrownHashiCorp · 2023-02-09T18:53:18Z

🛠️ Description

This PR includes changes to support adding project ID at the provider level. When no project ID is specified, the provider selects as default the ID of the first attached project.

Jira 🎟️ - Add project ID to provider config

🏗️ Acceptance tests

Are there any feature flags that are required to use this functionality?
Have you added an acceptance test for the functionality being added?
Have you run the acceptance tests on this branch?

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccHvnOnly'

==> Checking that code complies with gofmt requirements...
golangci-lint run --config ./golangci-config.yml 
WARN [linters context] bodyclose is disabled because of go1.18. You can track the evolution of the go1.18 support by following the https://github.com/golangci/golangci-lint/issues/2649. 
WARN [linters context] structcheck is disabled because of go1.18. You can track the evolution of the go1.18 support by following the https://github.com/golangci/golangci-lint/issues/2649. 
TF_ACC=1 go test ./internal/... -v -run=TestAccHvnOnly -timeout 360m -parallel=10
testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-hcp/internal/clients    (cached) [no tests to run]
testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-hcp/internal/consul     (cached) [no tests to run]
testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-hcp/internal/input      (cached) [no tests to run]
testing: warning: no tests to run
PASS
ok      github.com/hashicorp/terraform-provider-hcp/internal/provider   (cached) [no tests to run]

internal/provider/provider.go

…g project

* add validator for resource level project id, hce-339 * optionall read hvn project id from resource or provider config * adds project id validator unit tests * revise tests * WIP - investigate multiproject acceptance testing * multiproject unit tests (GTG), and acceptance tests (WIP) * create helper to retrieve project ID * use project ID helper when creating hvn * fix linting/incorporate comments * implement multiproject planonly acceptance test coverage * swap validator for isUUID * update datasource to support optional project id * reduce variables * add provider method to create project * update documentation * fix project err to ensure it returns complete err * add project validator to provider, update test error match --------- Co-authored-by: Brenna Hewer-Darroch <21015366+bcmdarroch@users.noreply.github.com>

* add project id * typo

* add project_id to consul resources * typo * typo

* add project id to aws network peering resource * add project ID field to datasource * update docs

* add project_id * typo * missing resource

* add project_id * typo

* add multi proj guide template * add TF examples * regen doc * update warning * clarify default project when no project set

* allow explicit project id on import * add project id to other resources * linting and test coverage * more explicit comments

hashicorp-cla · 2023-05-12T11:05:44Z

All committers have signed the CLA.

apriofrost · 2023-05-15T19:25:28Z

docs/guides/multi-project-migration-guide.md

+
+### Override provider project with resource project
+
+Projects may be set at both the resource and provider level. The resource-configured project is always preferred over the provider-configured project.


I discussed with @glasner about setting the project_id at the resource v.s. the provider config level in the use case of using multiple projects for multiple resources.
The general guidance from Jordan is to:

Use Provider Alias (docs here) to create aliases of providers with individual configurations (can have one alias per project). It would remove the need to assign projects to each resource, especially when there are multiple resources referencing different products (like HCP Packer and HCP Vault Secrets) to be created.

If there is only one HCP product resource with a limited resource count, like a few data sources referencing different HCP Vault Secret applications in different HCP projects, setting the project at the resource level is optimal.

Let me know if I missed anything in our conversation, @glasner .

To clarify: this is not a blocker, but a suggested change, to follow the Provider’s config best practice.

bcmdarroch

🎉 😅

bosouza · 2023-05-22T13:05:12Z

internal/provider/resource_vault_cluster.go

@@ -65,6 +66,14 @@ func resourceVaultCluster() *schema.Resource {
 				ValidateDiagFunc: validateSlugID,
 			},
 			// Optional fields
+			"project_id": {
+				Description:  "The ID of the HCP project where the Vault cluster is located.",


maybe it'd useful to say that if this parameter is not specified then the oldest project will be targeted

Thank you for your feedback, I've created a ticket to address it in a separate PR. Since it is a large change, I will discuss it with the team and we will implement it separately.

JolisaBrownHashiCorp requested a review from a team as a code owner February 9, 2023 18:53

JolisaBrownHashiCorp requested a review from a team February 9, 2023 18:53

JolisaBrownHashiCorp force-pushed the hce-339-feat-multi-project branch from 2b0e1f1 to 4958175 Compare February 9, 2023 18:56

JolisaBrownHashiCorp commented Feb 9, 2023

View reviewed changes

internal/provider/provider.go Show resolved Hide resolved

bcmdarroch added the do-not-merge label Feb 9, 2023

itsjaspermilan marked this pull request as draft February 9, 2023 19:38

JolisaBrownHashiCorp force-pushed the hce-339-feat-multi-project branch from 5d6c610 to 9ddf7f0 Compare February 14, 2023 17:03

JolisaBrownHashiCorp force-pushed the hce-339-feat-multi-project branch from aca3510 to 9ddf7f0 Compare February 21, 2023 18:37

bcmdarroch force-pushed the hce-339-feat-multi-project branch from c33f375 to f8c0d9e Compare March 8, 2023 22:15

bcmdarroch mentioned this pull request Mar 8, 2023

HCE-795: Add Project ID to Packer #476

Merged

bcmdarroch and others added 18 commits May 12, 2023 12:35

add optional project_id to provider config

9c9f1e1

use configured project as default if set

f84f849

add warning to getProjectFromCredentials

9cf1640

update provider project id default assignment to equal oldest existin…

a0365ff

…g project

update changelog

846f349

update docs

4bfacb5

add project id (#469)

7ccb100

HCE 790 Add project_id to AWS Transit Gateway Attachment Resource (#470)

a09f8ad

* add project id * typo

add project id (#472)

1858354

HCE-792: Add Project ID to Consul Cluster Resource (#473)

6f14aea

* add project_id to consul resources * typo * typo

Add project ID to AWS network peering (#471)

3079ac7

* add project id to aws network peering resource * add project ID field to datasource * update docs

HCE-793: Add Project ID to Vault Cluster (#474)

e8f1723

* add project_id * typo * missing resource

HCE-794: Add project_id to Boundary Cluster Resource (#475)

de9af2f

* add project_id * typo

add project_id to packer data sources (#476)

bd9f9e8

HCE-812: multi-project migration guide (#481)

e415863

* add multi proj guide template * add TF examples * regen doc * update warning * clarify default project when no project set

HCE-345: Allow Project ID on Terraform Import (#487)

08ef0d9

* allow explicit project id on import * add project id to other resources * linting and test coverage * more explicit comments

Update resource manager method names

3a0e48f

delores-hashicorp force-pushed the hce-339-feat-multi-project branch from 2d1516a to 3a0e48f Compare May 12, 2023 11:05

delores-hashicorp removed the do-not-merge label May 15, 2023

delores-hashicorp marked this pull request as ready for review May 15, 2023 18:21

delores-hashicorp requested a review from a team as a code owner May 15, 2023 18:21

delores-hashicorp requested a review from a team May 15, 2023 18:21

delores-hashicorp requested review from a team as code owners May 15, 2023 18:21

delores-hashicorp requested review from aoripov, bosouza, mkam and Achooo May 15, 2023 18:21

apriofrost reviewed May 15, 2023

View reviewed changes

bcmdarroch approved these changes May 15, 2023

View reviewed changes

tobias-hashicorp approved these changes May 16, 2023

View reviewed changes

FIX TGW resource ID split.

118996b

delores-hashicorp force-pushed the hce-339-feat-multi-project branch from 2a72000 to 118996b Compare May 16, 2023 12:04

aoripov approved these changes May 16, 2023

View reviewed changes

hanshasselberg approved these changes May 16, 2023

View reviewed changes

davidsbond approved these changes May 16, 2023

View reviewed changes

delores-hashicorp changed the title ~~Hce 339 feat multi project~~ HCE-339 feat multi project May 16, 2023

uruemu approved these changes May 16, 2023

View reviewed changes

JenGoldstrich approved these changes May 19, 2023

View reviewed changes

graham1228 approved these changes May 19, 2023

View reviewed changes

bosouza approved these changes May 22, 2023

View reviewed changes

mkam approved these changes May 22, 2023

View reviewed changes

Achooo approved these changes May 23, 2023

View reviewed changes

dmalch-hashicorp merged commit e4edb8e into main May 23, 2023
6 checks passed

dmalch-hashicorp deleted the hce-339-feat-multi-project branch May 23, 2023 14:40

aidan-mundy mentioned this pull request May 30, 2023

Update Contributor Docs and Resource-Specific Import Examples to Reflect Multi-Project Support #517

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HCE-339 feat multi project #454

HCE-339 feat multi project #454

JolisaBrownHashiCorp commented Feb 9, 2023 •

edited by delores-hashicorp

hashicorp-cla commented May 12, 2023 •

edited

apriofrost May 15, 2023 •

edited

apriofrost May 15, 2023

bcmdarroch left a comment

bosouza May 22, 2023

dmalch-hashicorp May 23, 2023 •

edited


		### Override provider project with resource project

		Projects may be set at both the resource and provider level. The resource-configured project is always preferred over the provider-configured project.

HCE-339 feat multi project #454

HCE-339 feat multi project #454

Conversation

JolisaBrownHashiCorp commented Feb 9, 2023 • edited by delores-hashicorp

🛠️ Description

🏗️ Acceptance tests

hashicorp-cla commented May 12, 2023 • edited

apriofrost May 15, 2023 • edited

Choose a reason for hiding this comment

apriofrost May 15, 2023

Choose a reason for hiding this comment

bcmdarroch left a comment

Choose a reason for hiding this comment

bosouza May 22, 2023

Choose a reason for hiding this comment

dmalch-hashicorp May 23, 2023 • edited

Choose a reason for hiding this comment

JolisaBrownHashiCorp commented Feb 9, 2023 •

edited by delores-hashicorp

hashicorp-cla commented May 12, 2023 •

edited

apriofrost May 15, 2023 •

edited

dmalch-hashicorp May 23, 2023 •

edited