Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 0 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@ repos:
name: Terraform format
- id: terraform_validate
name: Terraform validate
# Excluded: two orphan modules (not instantiated by any
# environment) whose resource bodies use `dynamic` blocks
# around scalar attributes — invalid HCL in any azurerm
# version. They were silently broken until terraform_validate
# started running in CI. Tracked separately; remove the
# exclusion as part of that cleanup.
exclude: |
(?x)^(
terraform/modules/compute/azure/cleanup-function/|
terraform/modules/registry/azure/
)
- id: terraform_tflint
name: Terraform lint
args:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion terraform/environments/aws/ci-cd-permissions/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ terraform {

required_providers {
aws = {
# This bootstrap root is already applied with the 6.x provider line
# (see .terraform.lock.hcl); pinned to ~> 6.0 rather than the
# workload environments' ~> 5.0 to match the committed lock file.
source = "hashicorp/aws"
version = ">= 5.0"
version = "~> 6.0"
}
}

Expand Down
36 changes: 20 additions & 16 deletions terraform/modules/compute/aws/cleanup-lambda/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion terraform/modules/compute/aws/cleanup-lambda/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.0"
version = "~> 5.0"
}
}
}
36 changes: 20 additions & 16 deletions terraform/modules/compute/aws/fargate/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion terraform/modules/compute/aws/fargate/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.0"
version = "~> 5.0"
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.0"
version = "~> 3.0"
}
}
}
30 changes: 17 additions & 13 deletions terraform/modules/compute/gcp/cleanup-function/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion terraform/modules/compute/gcp/cleanup-function/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.0"
version = "~> 5.0"
}
}
}
4 changes: 4 additions & 0 deletions terraform/modules/iam/azure/cudly-reservation-role/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ terraform {

required_providers {
azurerm = {
# Deliberately >= 3.0 (not ~> 3.0): this module is consumed by both
# terraform/environments/azure/ci-cd-permissions (azurerm ~> 3.0) and
# iac/federation/azure-target/terraform (azurerm ~> 4.0), so the
# constraint must intersect with both provider lines.
source = "hashicorp/azurerm"
version = ">= 3.0"
}
Expand Down
36 changes: 20 additions & 16 deletions terraform/modules/monitoring/aws/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion terraform/modules/monitoring/aws/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 5.0"
version = "~> 5.0"
}
}
}
33 changes: 18 additions & 15 deletions terraform/modules/monitoring/azure/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions terraform/modules/monitoring/azure/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ terraform {

required_providers {
azurerm = {
# Pinned to ~> 4.0 (not the codebase's ~> 3.0 azurerm convention)
# to match this module's previously-committed lock file (4.61.0).
# The Azure environment doesn't currently instantiate this module
# so the version split doesn't conflict with any running plan.
source = "hashicorp/azurerm"
version = "~> 4.0"
version = "~> 3.0"
}
}
}
30 changes: 17 additions & 13 deletions terraform/modules/monitoring/gcp/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading