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

Update account creation terraform to use native locking #9028

Merged
merged 23 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2cb41a7
updated account creation terraform to use native locking
dms1981 Jan 21, 2025
f7cc926
Added bucket statement to allow GitHub Actions to delete tflock files
dms1981 Jan 21, 2025
08c5593
add hosting-migrations team to their environments
sobostion Jan 22, 2025
7a784fe
Additional reviewers for yjaf
richgreen-moj Jan 22, 2025
8d61ecb
(EDIT: signed)
lwilts Jan 22, 2025
c2155ef
Bump bridgecrewio/checkov-action from 12.2944.0 to 12.2945.0
dependabot[bot] Jan 22, 2025
037ac5a
Bump github/codeql-action from 3.28.1 to 3.28.2
dependabot[bot] Jan 22, 2025
a8d506b
Enable R53 DNS Firewall in ALERT mode using `r53_dns_firewall` module
richgreen-moj Jan 10, 2025
b83acf9
Added README to module and adjust comments
richgreen-moj Jan 22, 2025
ac9706b
remove custom domain input as not currently being used
richgreen-moj Jan 22, 2025
831e85c
Legacy YJAF docs
ep-93 Jan 22, 2025
b6ebb75
update to correct GP cidr
dms1981 Jan 22, 2025
8f443ab
remove logging/monitoring config from `r53_dns_firewall` module
richgreen-moj Jan 22, 2025
a9e0a6f
Add `r53-dns-firewall`module to `core-vpc-*` github workflows
richgreen-moj Jan 22, 2025
4118740
Add Template Validation to workflow
ASTRobinson Jan 21, 2025
9eb1b6e
Bump bridgecrewio/checkov-action from 12.2945.0 to 12.2946.0
dependabot[bot] Jan 23, 2025
e461cbe
Automated code formatting fixes
github-actions[bot] Jan 23, 2025
d6a5f94
Bump github/codeql-action from 3.28.2 to 3.28.3
dependabot[bot] Jan 23, 2025
e63b9f4
add permissions to allow sprinkler the ability to remove locks throug…
dms1981 Jan 23, 2025
77e9e4d
wrapped root_users_with_state_access local in sort to maintain consis…
dms1981 Jan 23, 2025
bdfa5c7
allow further roles to remove tf locks
dms1981 Jan 23, 2025
3173248
Merge branch 'main' into feature/8345-native-state-locking
dms1981 Jan 23, 2025
6bb9ae8
cleaned up s3 policy
dms1981 Jan 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/analytical-platform-common" # This will store the object as environments/accounts/analytical-platform-common/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/analytical-platform-compute" # This will store the object as environments/accounts/analytical-platform-compute/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/analytical-platform-data-engineering" # This will store the object as environments/accounts/analytical-platform-data-engineering/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/analytical-platform-data" # This will store the object as environments/accounts/analytical-platform-data/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/analytical-platform-ingestion" # This will store the object as environments/accounts/analytical-platform-ingestion/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/analytical-platform-landing" # This will store the object as environments/accounts/analytical-platform-landing/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/analytical-platform-management" # This will store the object as environments/accounts/analytical-platform-management/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/analytical-platform/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/analytical-platform" # This will store the object as environments/accounts/analytical-platform/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/apex/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/apex" # This will store the object as environments/accounts/apex/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/bichard7/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/bichard7" # This will store the object as environments/accounts/bichard7/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/bootstrap/delegate-access" # This will store the object as environments/bootstrap/delegate-access/${workspace}/terraform.tfstate
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/bootstrap/member-bootstrap" # This will store the object as environments/bootstrap/member-bootstrap/${workspace}/terraform.tfstate
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/bootstrap/secure-baselines" # This will store the object as environments/bootstrap/secure-baselines/${workspace}/terraform.tfstate
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/bootstrap/single-sign-on" # This will store the object as environments/bootstrap/single-sign-on/${workspace}/terraform.tfstate
}
}
2 changes: 1 addition & 1 deletion terraform/environments/ccms-ebs-upgrade/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/ccms-ebs-upgrade" # This will store the object as environments/accounts/ccms-ebs-upgrade/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/ccms-ebs/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/ccms-ebs" # This will store the object as environments/accounts/ccms-ebs/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/cdpt-chaps/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/cdpt-chaps" # This will store the object as environments/accounts/cdpt-chaps/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/cdpt-ifs/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/cdpt-ifs" # This will store the object as environments/accounts/cdpt-ifs/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/cica-copilot/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/cica-copilot" # This will store the object as environments/accounts/cica-copilot/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/cica-data-extraction/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/cica-data-extraction" # This will store the object as environments/accounts/cica-data-extraction/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/cica-tariff/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/cica-tariff" # This will store the object as environments/accounts/cica-tariff/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/contract-work-administration" # This will store the object as environments/accounts/contract-work-administration/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/cooker/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/cooker" # This will store the object as environments/accounts/cooker/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/core-logging/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/core-logging" # This will store the object as environments/core-logging/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/core-network-services/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/core-network-services" # This will store the object as environments/core-network-services/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
1 change: 1 addition & 0 deletions terraform/environments/core-sandbox/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/core-sandbox" # This will store the object as environments/core-sandbox/${workspace}/terraform.tfstate
}
}
2 changes: 1 addition & 1 deletion terraform/environments/core-security/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/core-security" # This will store the object as environments/core-security/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}

2 changes: 1 addition & 1 deletion terraform/environments/core-shared-services/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/core-shared-services" # This will store the object as environments/core-shared-services/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/core-vpc/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/core-vpc" # This will store the object as environments/core-vpc/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/corporate-information-system" # This will store the object as environments/accounts/corporate-information-system/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/corporate-staff-rostering" # This will store the object as environments/accounts/corporate-staff-rostering/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/dacp/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/dacp" # This will store the object as environments/accounts/dacp/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/data-and-insights-wepi/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/data-and-insights-wepi" # This will store the object as environments/accounts/data-and-insights-wepi/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/data-platform-apps-and-tools" # This will store the object as environments/accounts/data-platform-apps-and-tools/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/data-platform/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/data-platform" # This will store the object as environments/accounts/data-platform/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/delete-account/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/delete-account" # This will store the object as environments/accounts/delete-account/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/delius-alfresco/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/delius-alfresco" # This will store the object as environments/accounts/delius-alfresco/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/delius-core/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/delius-core" # This will store the object as environments/accounts/delius-core/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/delius-iaps/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/delius-iaps" # This will store the object as environments/accounts/delius-iaps/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/delius-jitbit/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/delius-jitbit" # This will store the object as environments/accounts/delius-jitbit/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/delius-mis/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/delius-mis" # This will store the object as environments/accounts/delius-mis/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/delius-nextcloud/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/delius-nextcloud" # This will store the object as environments/accounts/delius-nextcloud/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/digital-prison-reporting" # This will store the object as environments/accounts/digital-prison-reporting/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
2 changes: 1 addition & 1 deletion terraform/environments/edw/backend.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
encrypt = true
key = "terraform.tfstate"
region = "eu-west-2"
use_lockfile = true
workspace_key_prefix = "environments/accounts/edw" # This will store the object as environments/accounts/edw/${workspace}/terraform.tfstate
dynamodb_table = "modernisation-platform-terraform-state-lock"
}
}
Loading
Loading