Skip to content
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.

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

feat: upgrade module version to allow Terraform Google provider v6 #1350

Merged

Conversation

daniel-cit
Copy link
Contributor

@daniel-cit daniel-cit commented Nov 5, 2024

Upgrade module version to allow Terraform Google provider v6
complete upgrade of 1-org depends on cloud function module that depends on cloud run module. They can be integrated later.

includes the creation of new inputs for project_deletion_policy and folder_deletion_protection

@daniel-cit daniel-cit marked this pull request as ready for review November 9, 2024 18:30
@daniel-cit
Copy link
Contributor Author

@apeabody @bharathkkb Could you PTAL?

@daniel-cit daniel-cit changed the title chore: upgrade module version to allow Terraform Google provider v6 feat: upgrade module version to allow Terraform Google provider v6 Nov 10, 2024
@apeabody apeabody self-assigned this Nov 10, 2024
Copy link
Contributor

@apeabody apeabody left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @daniel-cit! One question, otherwise this LGTM

Co-authored-by: Andrew Peabody <andrewpeabody@google.com>
Copy link
Contributor

@apeabody apeabody left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @daniel-cit!

@apeabody apeabody enabled auto-merge (squash) November 11, 2024 20:06
@apeabody
Copy link
Contributor

@daniel-cit

Looks like another deletion_protection

Step #34 - "destroy-bootstrap":         	Error Trace:	/builder/home/go/pkg/mod/github.com/gruntwork-io/terratest@v0.47.0/modules/terraform/destroy.go:11
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/blueprint-test@v0.16.1/pkg/tft/terraform.go:528
Step #34 - "destroy-bootstrap":         	            				/workspace/test/integration/bootstrap/bootstrap_test.go:330
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/blueprint-test@v0.16.1/pkg/tft/terraform.go:646
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/blueprint-test@v0.16.1/pkg/tft/terraform.go:667
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/blueprint-test@v0.16.1/pkg/utils/stages.go:31
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/blueprint-test@v0.16.1/pkg/tft/terraform.go:671
Step #34 - "destroy-bootstrap":         	Error:      	Received unexpected error:
Step #34 - "destroy-bootstrap":         	            	FatalError{Underlying: error while running command: exit status 1; 
Step #34 - "destroy-bootstrap":         	            	Error: cannot destroy workflow without setting deletion_protection=false and running `terraform apply`
Step #34 - "destroy-bootstrap":         	            	}
Step #34 - "destroy-bootstrap":         	Test:       	TestBootstrap

@daniel-cit
Copy link
Contributor Author

build failed because field deletion_protection was added to the resource google_workflows_workflow in Terraform Google provider v6.11.0
hashicorp/terraform-provider-google#20106

This will require a change in the bootstrap module to fix

@apeabody
Copy link
Contributor

build failed because field deletion_protection was added to the resource google_workflows_workflow in Terraform Google provider v6.11.0 hashicorp/terraform-provider-google#20106

This will require a change in the bootstrap module to fix

@daniel-cit Surprising that was added in a non-major version, could also pin this to <= v6.10 short term if needed.

@daniel-cit
Copy link
Contributor Author

build failed because field deletion_protection was added to the resource google_workflows_workflow in Terraform Google provider v6.11.0 hashicorp/terraform-provider-google#20106
This will require a change in the bootstrap module to fix

@daniel-cit Surprising that was added in a non-major version, could also pin this to <= v6.10 short term if needed.

I have set the version constraint with <= v6.10 and will update it after fixing the bootstrap module

@apeabody apeabody merged commit 72e227c into terraform-google-modules:master Nov 12, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants