Skip to content

Commit

Permalink
Merge branch 'master' into update-typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@juliocc
juliocc authored Apr 9, 2024
2 parents be83c18 + 2831af0 commit e935156
Show file tree
Hide file tree
Showing 97 changed files with 228 additions and 226 deletions.
4 changes: 2 additions & 2 deletions blueprints/cloud-operations/scheduled-asset-inventory-export-bq/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ module "test" {
source = "./fabric/blueprints/cloud-operations/scheduled-asset-inventory-export-bq"
billing_account = "1234-ABCD-1234"
cai_config = {
bq_dataset = "my-dataset"
bq_dataset = "my_dataset"
bq_table = "my_table"
bq_table_overwrite = "true"
target_node = "organization/1234567890"
Expand All @@ -95,7 +95,7 @@ module "test" {
bucket = "my-bucket"
filename = "my-folder/myfile.json"
format = "NEWLINE_DELIMITED_JSON"
bq_dataset = "my-dataset"
bq_dataset = "my_dataset"
bq_table = "my_table"
}
project_create = true
Expand Down
4 changes: 2 additions & 2 deletions blueprints/gke/patterns/autopilot-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions blueprints/gke/patterns/batch/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions blueprints/gke/patterns/kafka/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions blueprints/gke/patterns/mysql/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions blueprints/gke/patterns/redis-cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions default-versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/__experimental_deprecated/alloydb-instance/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/__experimental_deprecated/net-neg/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/__experimental_deprecated/project-iam-magic/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/analytics-hub/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/api-gateway/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/apigee/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/artifact-registry/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
12 changes: 6 additions & 6 deletions modules/bigquery-dataset/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The access variables are split into `access` and `access_identities` variables,
module "bigquery-dataset" {
source = "./fabric/modules/bigquery-dataset"
project_id = "my-project"
id = "my-dataset"
id = "my_dataset"
access = {
reader-group = { role = "READER", type = "group" }
owner = { role = "OWNER", type = "user" }
Expand All @@ -32,7 +32,7 @@ module "bigquery-dataset" {
reader-group = "[email protected]"
owner = "[email protected]"
project_owners = "projectOwners"
view_1 = "my-project|my-dataset|my-table"
view_1 = "my-project|my_dataset|my-table"
}
}
# tftest modules=1 resources=5 inventory=simple.yaml
Expand All @@ -46,7 +46,7 @@ Access configuration can also be specified via IAM instead of basic roles via th
module "bigquery-dataset" {
source = "./fabric/modules/bigquery-dataset"
project_id = "my-project"
id = "my-dataset"
id = "my_dataset"
iam = {
"roles/bigquery.dataOwner" = ["user:[email protected]"]
}
Expand Down Expand Up @@ -143,7 +143,7 @@ Authorized views can be specified both using the standard `access` options and t
module "bigquery-dataset" {
source = "./fabric/modules/bigquery-dataset"
project_id = "my-project"
id = "my-dataset"
id = "my_dataset"
authorized_views = [
{
project_id = "view_project"
Expand Down Expand Up @@ -176,7 +176,7 @@ Dataset options are set via the `options` variable. all options must be specifie
module "bigquery-dataset" {
source = "./fabric/modules/bigquery-dataset"
project_id = "my-project"
id = "my-dataset"
id = "my_dataset"
options = {
default_table_expiration_ms = 3600000
default_partition_expiration_ms = null
Expand Down Expand Up @@ -227,7 +227,7 @@ locals {
module "bigquery-dataset" {
source = "./fabric/modules/bigquery-dataset"
project_id = "my-project"
id = "my-dataset"
id = "my_dataset"
tables = {
table_a = {
deletion_protection = true
Expand Down
4 changes: 2 additions & 2 deletions modules/bigquery-dataset/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/bigtable-instance/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/billing-account/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/binauthz/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/cloud-config-container/__need_fixing/onprem/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/cloud-config-container/__need_fixing/squid/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/cloud-config-container/coredns/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/cloud-config-container/cos-generic-metadata/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
4 changes: 2 additions & 2 deletions modules/cloud-config-container/envoy-traffic-director/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.18.0, < 6.0.0" # tftest
version = ">= 5.24.0, < 6.0.0" # tftest
}
}
}
Loading

0 comments on commit e935156

Please sign in to comment.