Skip to content

Commit

Permalink
fix source and version of module
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-cit committed Oct 31, 2024
1 parent 3c97c4b commit e420434
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 21 deletions.
2 changes: 1 addition & 1 deletion examples/cloudbuild_repo_connection_github/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "git_repo_connection" {
source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
version = "~> 9.0"
version = "~> 8.0"

project_id = var.project_id
connection_config = {
Expand Down
3 changes: 2 additions & 1 deletion examples/cloudbuild_repo_connection_gitlab/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/

module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"
source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
version = "~> 8.0"

project_id = var.project_id
connection_config = {
Expand Down
3 changes: 2 additions & 1 deletion examples/im_cloudbuild_workspace_github/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/

module "im_workspace" {
source = "../../modules/im_cloudbuild_workspace"
source = "terraform-google-modules/bootstrap/google//modules/im_cloudbuild_workspace"
version = "~> 8.0"

project_id = var.project_id
deployment_id = "im-example-github-deployment"
Expand Down
3 changes: 2 additions & 1 deletion examples/im_cloudbuild_workspace_gitlab/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/

module "im_workspace" {
source = "../../modules/im_cloudbuild_workspace"
source = "terraform-google-modules/bootstrap/google//modules/im_cloudbuild_workspace"
version = "~> 8.0"

project_id = var.project_id
deployment_id = "im-example-gitlab-deployment"
Expand Down
8 changes: 4 additions & 4 deletions examples/tf_cloudbuild_builder_simple_github/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ locals {
}

module "cloudbuilder" {
# source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
# version = "~> 8.0"
source = "../../modules/tf_cloudbuild_builder"
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
version = "~> 8.0"

project_id = module.enabled_google_apis.project_id
dockerfile_repo_uri = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
Expand All @@ -54,7 +53,8 @@ resource "time_sleep" "propagation" {
}

module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"
source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
version = "~> 8.0"

project_id = var.project_id
connection_config = {
Expand Down
7 changes: 4 additions & 3 deletions examples/tf_cloudbuild_builder_simple_gitlab/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ locals {
}

module "cloudbuilder" {
source = "../../modules/tf_cloudbuild_builder"

source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
version = "~> 8.0"

project_id = module.enabled_google_apis.project_id
dockerfile_repo_uri = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
Expand Down Expand Up @@ -56,7 +56,8 @@ resource "time_sleep" "propagation" {
}

module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"
source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
version = "~> 8.0"

project_id = var.project_id
connection_config = {
Expand Down
5 changes: 3 additions & 2 deletions examples/tf_cloudbuild_workspace_simple/files/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
*/

module "test-vpc-module" {
source = "terraform-google-modules/network/google"
version = "~> 9.0"
source = "terraform-google-modules/network/google"
version = "~> 9.0"

project_id = var.project_id
network_name = "my-custom-mode-network"
mtu = 1460
Expand Down
1 change: 1 addition & 0 deletions examples/tf_cloudbuild_workspace_simple/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ resource "google_sourcerepo_repository" "tf_config_repo" {
module "bootstrap_csr_repo" {
source = "terraform-google-modules/gcloud/google"
version = "~> 3.1"

upgrade = false

create_cmd_entrypoint = "${path.module}/scripts/push-to-repo.sh"
Expand Down
5 changes: 3 additions & 2 deletions examples/tf_cloudbuild_workspace_simple_github/files/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
*/

module "test-vpc-module" {
source = "terraform-google-modules/network/google"
version = "~> 9.0"
source = "terraform-google-modules/network/google"
version = "~> 9.0"

project_id = var.project_id
network_name = "my-custom-mode-network-gh"
mtu = 1460
Expand Down
6 changes: 4 additions & 2 deletions examples/tf_cloudbuild_workspace_simple_github/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ locals {
}

module "tf_workspace" {
source = "../../modules/tf_cloudbuild_workspace"
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
version = "~> 8.0"

project_id = module.enabled_google_apis.project_id
tf_repo_type = "CLOUDBUILD_V2_REPOSITORY"
Expand Down Expand Up @@ -59,7 +60,8 @@ resource "time_sleep" "propagation" {
}

module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"
source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
version = "~> 8.0"

project_id = var.project_id
connection_config = {
Expand Down
5 changes: 3 additions & 2 deletions examples/tf_cloudbuild_workspace_simple_gitlab/files/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
*/

module "test-vpc-module" {
source = "terraform-google-modules/network/google"
version = "~> 9.0"
source = "terraform-google-modules/network/google"
version = "~> 9.0"

project_id = var.project_id
network_name = "my-custom-mode-network-gl"
mtu = 1460
Expand Down
6 changes: 4 additions & 2 deletions examples/tf_cloudbuild_workspace_simple_gitlab/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ locals {
}

module "tf_workspace" {
source = "../../modules/tf_cloudbuild_workspace"
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
version = "~> 8.0"

project_id = module.enabled_google_apis.project_id
tf_repo_type = "CLOUDBUILD_V2_REPOSITORY"
Expand Down Expand Up @@ -58,7 +59,8 @@ resource "time_sleep" "propagation" {
}

module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"
source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
version = "~> 8.0"

project_id = var.project_id
connection_config = {
Expand Down

0 comments on commit e420434

Please sign in to comment.