Skip to content

Commit

Permalink
Allow latest Terraform google plugin
Browse files Browse the repository at this point in the history 
PR #3195 brings in a fix to address a Terraform behavioral change
introduced in plugin v6.2.0 and above by

hashicorp/terraform-provider-google@bd42980
  • Loading branch information
@tpdownes
tpdownes committed Nov 4, 2024
1 parent 24a0596 commit 991fea3
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions pkg/config/expand.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ func getDefaultGoogleProviders(bp Blueprint) map[string]TerraformProvider {
return map[string]TerraformProvider{
"google": {
Source: "hashicorp/google",
Version: ">= 5.44.2, < 6.2.0",
Version: ">= 5.44.2, < 6.10.0",
Configuration: gglConf},
"google-beta": {
Source: "hashicorp/google-beta",
Version: ">= 5.44.2, < 6.2.0",
Version: ">= 5.44.2, < 6.10.0",
Configuration: gglConf}}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/config/expand_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ func (s *zeroSuite) TestExpandProviders(c *C) {
c.Check(g.TerraformProviders, DeepEquals, map[string]PR{
"google": TerraformProvider{
Source: "hashicorp/google",
Version: ">= 5.44.2, < 6.2.0"},
Version: ">= 5.44.2, < 6.10.0"},
"google-beta": TerraformProvider{
Source: "hashicorp/google-beta",
Version: ">= 5.44.2, < 6.2.0"}})
Version: ">= 5.44.2, < 6.10.0"}})
}

{ // no def PR, group PR
Expand Down
4 changes: 2 additions & 2 deletions ...lidate_configs/golden_copies/expectations/igc_pkr/.ghpc/artifacts/expanded_blueprint.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ deployment_groups:
terraform_providers:
google:
source: hashicorp/google
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
zone: ((var.zone))
google-beta:
source: hashicorp/google-beta
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
Expand Down
4 changes: 2 additions & 2 deletions tools/validate_configs/golden_copies/expectations/igc_pkr/zero/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
}
}
8 changes: 4 additions & 4 deletions ...alidate_configs/golden_copies/expectations/igc_tf/.ghpc/artifacts/expanded_blueprint.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ deployment_groups:
terraform_providers:
google:
source: hashicorp/google
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
zone: ((var.zone))
google-beta:
source: hashicorp/google-beta
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
Expand Down Expand Up @@ -80,14 +80,14 @@ deployment_groups:
terraform_providers:
google:
source: hashicorp/google
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
zone: ((var.zone))
google-beta:
source: hashicorp/google-beta
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
Expand Down
4 changes: 2 additions & 2 deletions tools/validate_configs/golden_copies/expectations/igc_tf/one/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
}
}
4 changes: 2 additions & 2 deletions tools/validate_configs/golden_copies/expectations/igc_tf/zero/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
}
}
4 changes: 2 additions & 2 deletions ..._configs/golden_copies/expectations/merge_flatten/.ghpc/artifacts/expanded_blueprint.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ deployment_groups:
terraform_providers:
google:
source: hashicorp/google
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
zone: ((var.zone))
google-beta:
source: hashicorp/google-beta
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
Expand Down
4 changes: 2 additions & 2 deletions tools/validate_configs/golden_copies/expectations/merge_flatten/zero/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
}
}
4 changes: 2 additions & 2 deletions ...gs/golden_copies/expectations/versioned_blueprint/.ghpc/artifacts/expanded_blueprint.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ deployment_groups:
terraform_providers:
google:
source: hashicorp/google
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
zone: ((var.zone))
google-beta:
source: hashicorp/google-beta
version: '>= 5.44.2, < 6.2.0'
version: '>= 5.44.2, < 6.10.0'
configuration:
project: ((var.project_id))
region: ((var.region))
Expand Down
4 changes: 2 additions & 2 deletions tools/validate_configs/golden_copies/expectations/versioned_blueprint/primary/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.44.2, < 6.2.0"
version = ">= 5.44.2, < 6.10.0"
}
}
}

0 comments on commit 991fea3

Please sign in to comment.