Skip to content

Commit

Permalink
Merge branch 'GoogleCloudPlatform:master' into dns_e2e
Browse files Browse the repository at this point in the history
  • Loading branch information
@dibaskar-google
dibaskar-google authored Dec 21, 2023
2 parents dc37f42 + e592996 commit 7f873c8
Show file tree
Hide file tree
Showing 85 changed files with 685 additions and 547 deletions.
6 changes: 2 additions & 4 deletions default-versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


13 changes: 0 additions & 13 deletions fast/stages/0-bootstrap/templates/workflow-github.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,6 @@ jobs:
name: Checkout repository
uses: actions/checkout@v3

# # Print JWT token payload, useful for debugging
# - id: jwt-debug
# name: Print GITHUB_TOKEN payload
# shell: python -u {0}
# run: |
# import base64
# import json
#
# token = '${{ secrets.GITHUB_TOKEN }}'
# payload_text = token.split('.')[1]
# payload = json.loads(base64.urlsafe_b64decode(payload_text + '=' * (4-len(payload_text) %4)))
# print(json.dumps(payload, indent=2))

# set up SSH key authentication to the modules repository
- id: ssh-config
name: Configure SSH authentication
Expand Down
6 changes: 2 additions & 4 deletions modules/__experimental/alloydb-instance/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/__experimental/net-neg/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/__experimental/project-iam-magic/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/api-gateway/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/apigee/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/artifact-registry/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/bigquery-dataset/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/bigtable-instance/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/billing-account/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/binauthz/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 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,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 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,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/cloud-config-container/coredns/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 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,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 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,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 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,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/cloud-config-container/mysql/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/cloud-config-container/nginx-tls/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/cloud-config-container/nginx/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/cloud-config-container/simple-nva/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/cloud-function-v1/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


6 changes: 2 additions & 4 deletions modules/cloud-function-v2/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 5.6.0, < 6.0.0" # tftest
version = ">= 5.10.0, < 6.0.0" # tftest
}
}
}


Loading

0 comments on commit 7f873c8

Please sign in to comment.