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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 20 commits into from
Nov 12, 2024
Merged

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

merged 20 commits into from
Nov 12, 2024

Conversation

daniel-cit
Copy link
Contributor

@daniel-cit daniel-cit commented Nov 5, 2024 •
edited
Loading

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
upgrade simple_bucket module
ecdd8f2
@daniel-cit
upgrade bootstrap and project-factory modules
ebaf7dd
@daniel-cit
chore: upgrade module version to allow terraform Google provider v6
3e4302d
@daniel-cit
chore: upgrade modules to terraform provider v6
7f29131
@daniel-cit
comment usage of folder_deletion_protection until update of cloud fun…
e888cef 
…ction module
@daniel-cit
fix output type for folder_deletion_protection
8cb3e20
@daniel-cit
update backends.balancingMode to CONNECTION for an INTERNAL backend s…
6ddcfca 
…ervice
@daniel-cit
upgrade KMS module
29cbefd
@daniel-cit
initialize workflows api service identity
ffce27b
@daniel-cit
upgrade lb-internal module version
1c88d60
@daniel-cit
enable storage.googleapis.com in 4-projects base shared vpc project
7226225
@daniel-cit
update provider restriction
012b3b3
@daniel-cit
update modules
1c93a04
@daniel-cit
fix lint
50b9e58
@daniel-cit
set deletion protection to false
254edb9
@daniel-cit
Merge remote-tracking branch 'origin/master' into upgrade-modules-ver…
824ea36 
…sion
@daniel-cit
fix subnetwork_project validation issue
e7009c6
@daniel-cit
configure deletion_policy for env network projects
7b81b9b
@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
apeabody
apeabody reviewed Nov 10, 2024
View reviewed changes
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

@daniel-cit @apeabody
Update 0-bootstrap/cb.tf
46cab67 
Co-authored-by: Andrew Peabody <[email protected]>
apeabody
apeabody approved these changes Nov 11, 2024
View reviewed changes
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/[email protected]/modules/terraform/destroy.go:11
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/[email protected]/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/[email protected]/pkg/tft/terraform.go:646
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/[email protected]/pkg/tft/terraform.go:667
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/[email protected]/pkg/utils/stages.go:31
Step #34 - "destroy-bootstrap":         	            				/builder/home/go/pkg/mod/github.com/!google!cloud!platform/cloud-foundation-toolkit/infra/[email protected]/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
@release-please release-please bot mentioned this pull request Nov 6, 2024
Open
@daniel-cit daniel-cit mentioned this pull request Nov 12, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apeabody apeabody apeabody approved these changes

@rjerrems rjerrems Awaiting requested review from rjerrems rjerrems is a code owner

@gtsorbo gtsorbo Awaiting requested review from gtsorbo

@eeaton eeaton Awaiting requested review from eeaton eeaton is a code owner

@sleighton2022 sleighton2022 Awaiting requested review from sleighton2022 sleighton2022 is a code owner

Assignees

@apeabody apeabody

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@daniel-cit @apeabody