HCPF-1673: Fix HVS ignoring default project change. #808

delores-hashicorp · 2024-04-08T06:52:21Z

This change fixes parts of the issue where resources are not sensitive to default project ID changes. It also fixes VAULT-25738.

This fix is only for HVS. The other resources that have this issue will be incrementally fixed.

🛠️ Description

🏗️ 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=TestAccVaultSecretsResourceApp'

==> Checking that code complies with gofmt requirements...
golangci-lint run --config ./golangci-config.yml
TF_ACC=1 go test ./internal/... -v -run=TestAccVaultSecretsResourceApp -timeout 360m -parallel=10
?   	github.com/hashicorp/terraform-provider-hcp/internal/clients/iampolicy	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/clients/packerv2	[no test files]
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/hcpvalidator	(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]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/acctest	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/customtypes	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/modifiers	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer	[no test files]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/iam	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/logstreaming	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/sources/artifact	(cached) [no tests to run]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils/configbuilder	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils/configbuilder/packerconfig	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils/testcheck	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils/testclient	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/utils	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/utils/base	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/utils/location	[no test files]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/sources/version	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/resourcemanager	(cached) [no tests to run]
=== RUN   TestAccVaultSecretsResourceApp
--- PASS: TestAccVaultSecretsResourceApp (3.67s)
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/vaultsecrets	4.188s
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/waypoint	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/webhook	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/webhook/validator	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/providersdkv2	(cached) [no tests to run]

$  make testacc TESTARGS='-run=TestAccVaultSecretsResourceSecret'

==> Checking that code complies with gofmt requirements...
golangci-lint run --config ./golangci-config.yml
TF_ACC=1 go test ./internal/... -v -run=TestAccVaultSecretsResourceSecret -timeout 360m -parallel=10
?   	github.com/hashicorp/terraform-provider-hcp/internal/clients/iampolicy	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/clients/packerv2	[no test files]
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/hcpvalidator	(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]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/acctest	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/customtypes	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/modifiers	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer	[no test files]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/iam	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/logstreaming	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/sources/artifact	(cached) [no tests to run]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils/configbuilder	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils/configbuilder/packerconfig	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils/testcheck	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/testutils/testclient	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/utils	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/utils/base	[no test files]
?   	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/utils/location	[no test files]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/packer/sources/version	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/resourcemanager	(cached) [no tests to run]
=== RUN   TestAccVaultSecretsResourceSecret
--- PASS: TestAccVaultSecretsResourceSecret (4.49s)
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/vaultsecrets	5.240s
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/waypoint	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/webhook	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/provider/webhook/validator	(cached) [no tests to run]
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-hcp/internal/providersdkv2	(cached) [no tests to run]

loshz · 2024-04-15T13:54:36Z

internal/provider/vaultsecrets/resource_vault_secrets_app_test.go

@@ -13,6 +14,7 @@ import (

 func TestAccVaultSecretsResourceApp(t *testing.T) {
 	testAppName := generateRandomSlug()
+	projectID := os.Getenv("HCP_PROJECT_ID")


Sorry for the lack on context on my behalf, but will this test only pass if this env var is set?

The env var exists to set the project the app will be created in. If the app was to be created in the default project, like was happening before, the env var would not be needed.

So this is an integration/e2e and not a unit test? It will actually create resources in HCP?

Yes, it will

should we consider adding two tests here. one with the env, and other with the override in tf files?

codergs · 2024-04-18T16:33:05Z

internal/provider/vaultsecrets/resource_vault_secrets_app.go

@@ -121,9 +142,14 @@ func (r *resourceVaultsecretsApp) Read(ctx context.Context, req resource.ReadReq
 		return
 	}

+	projectID := r.client.Config.ProjectID
+	if !state.ProjectID.IsUnknown() {
+		projectID = state.ProjectID.ValueString()


nit: If I am getting this correctly, then idea is to read project id from plan for CUD apis, but read it from state for R, right? In that case, we can probably add a comment here explaining why Read api has state lookup and CUD apis have plan lookup.

codergs · 2024-04-18T16:34:40Z

internal/provider/vaultsecrets/resource_vault_secrets_secret_test.go

@@ -13,6 +14,7 @@ import (

 func TestAccVaultSecretsResourceSecret(t *testing.T) {
 	testAppName := generateRandomSlug()
+	projectID := os.Getenv("HCP_PROJECT_ID")


same concerns as above. The other test could be expect this project id - might have to create it using the tf. thoughts?

This change also includes making project_id an optional field in the secrets and sercrets app schemas to allow users choose what project the app or secret should be created in.

delores-hashicorp requested a review from a team April 8, 2024 06:53

delores-hashicorp force-pushed the HCPF-1673 branch from ea16e49 to ae390f9 Compare April 9, 2024 13:28

delores-hashicorp marked this pull request as ready for review April 9, 2024 13:28

delores-hashicorp requested review from a team as code owners April 9, 2024 13:28

delores-hashicorp requested review from blueberry-pi and bosouza April 9, 2024 13:28

dmalch-hashicorp approved these changes Apr 10, 2024

View reviewed changes

aoripov approved these changes Apr 15, 2024

View reviewed changes

loshz reviewed Apr 15, 2024

View reviewed changes

delores-hashicorp requested a review from loshz April 18, 2024 06:13

delores-hashicorp force-pushed the HCPF-1673 branch from 66e45b7 to d4e739e Compare April 18, 2024 12:49

delores-hashicorp requested a review from a team as a code owner April 18, 2024 12:49

codergs reviewed Apr 18, 2024

View reviewed changes

delores-hashicorp force-pushed the HCPF-1673 branch from 74717c2 to 77e86c9 Compare April 22, 2024 13:47

delores-hashicorp added 3 commits April 22, 2024 15:51

Fix HVS ignoring default project change.

4cc564c

This change also includes making project_id an optional field in the secrets and sercrets app schemas to allow users choose what project the app or secret should be created in.

Generate documentation

f5b98bd

Add changelog

aef3fdc

delores-hashicorp force-pushed the HCPF-1673 branch from 77e86c9 to aef3fdc Compare April 22, 2024 13:52

delores-hashicorp removed request for blueberry-pi and bosouza April 22, 2024 14:02

Create resources in specified projects

a03649b

delores-hashicorp force-pushed the HCPF-1673 branch from f625c5f to a03649b Compare April 22, 2024 17:09

codergs approved these changes Apr 22, 2024

View reviewed changes

delores-hashicorp merged commit 1b2e637 into main Apr 22, 2024
6 checks passed

delores-hashicorp deleted the HCPF-1673 branch April 22, 2024 17:33

This was referenced Apr 25, 2024

Resources are not sensitive to provider's default project ID changes #742

Open

Circular Dependency project_id #677

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HCPF-1673: Fix HVS ignoring default project change. #808

HCPF-1673: Fix HVS ignoring default project change. #808

delores-hashicorp commented Apr 8, 2024 •

edited

Loading

loshz Apr 15, 2024

delores-hashicorp Apr 15, 2024 •

edited

Loading

loshz Apr 15, 2024

delores-hashicorp Apr 15, 2024

codergs Apr 18, 2024

codergs Apr 18, 2024

codergs Apr 18, 2024 •

edited

Loading

HCPF-1673: Fix HVS ignoring default project change. #808

HCPF-1673: Fix HVS ignoring default project change. #808

Conversation

delores-hashicorp commented Apr 8, 2024 • edited Loading

🛠️ Description

🏗️ Acceptance tests

loshz Apr 15, 2024

Choose a reason for hiding this comment

delores-hashicorp Apr 15, 2024 • edited Loading

Choose a reason for hiding this comment

loshz Apr 15, 2024

Choose a reason for hiding this comment

delores-hashicorp Apr 15, 2024

Choose a reason for hiding this comment

codergs Apr 18, 2024

Choose a reason for hiding this comment

codergs Apr 18, 2024

Choose a reason for hiding this comment

codergs Apr 18, 2024 • edited Loading

Choose a reason for hiding this comment

delores-hashicorp commented Apr 8, 2024 •

edited

Loading

delores-hashicorp Apr 15, 2024 •

edited

Loading

codergs Apr 18, 2024 •

edited

Loading