Skip to content

Commit

Permalink
lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-cit committed Oct 25, 2024
1 parent 0c1f328 commit f4946df
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 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 @@ -14,7 +14,7 @@
* limitations under the License.
*/

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

Expand Down
4 changes: 2 additions & 2 deletions examples/cloudbuild_repo_connection_github/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

output "cloud_build_repositories_2nd_gen_connection" {
description = "Cloudbuild connection created."
value = module.github_connection.cloud_build_repositories_2nd_gen_connection
value = module.git_repo_connection.cloud_build_repositories_2nd_gen_connection
}

output "cloud_build_repositories_2nd_gen_repositories" {
description = "Created repositories."
value = module.github_connection.cloud_build_repositories_2nd_gen_repositories
value = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories
}

2 changes: 1 addition & 1 deletion examples/cloudbuild_repo_connection_gitlab/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

module "gitlab_connection" {
module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"

project_id = var.project_id
Expand Down
4 changes: 2 additions & 2 deletions examples/cloudbuild_repo_connection_gitlab/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

output "cloud_build_repositories_2nd_gen_connection" {
description = "Cloudbuild connection created."
value = module.gitlab_connection.cloud_build_repositories_2nd_gen_connection
value = module.git_repo_connection.cloud_build_repositories_2nd_gen_connection
}

output "cloud_build_repositories_2nd_gen_repositories" {
description = "Created repositories."
value = module.gitlab_connection.cloud_build_repositories_2nd_gen_repositories
value = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories
}
6 changes: 3 additions & 3 deletions examples/tf_cloudbuild_builder_simple_github/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module "cloudbuilder" {
source = "../../modules/tf_cloudbuild_builder"

project_id = module.enabled_google_apis.project_id
dockerfile_repo_uri = module.github_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
dockerfile_repo_uri = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
dockerfile_repo_type = "GITHUB"
use_cloudbuildv2_repository = true
trigger_location = local.location
Expand All @@ -49,10 +49,10 @@ module "cloudbuilder" {
resource "time_sleep" "propagation" {
create_duration = "30s"

depends_on = [module.github_connection]
depends_on = [module.git_repo_connection]
}

module "github_connection" {
module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"

project_id = var.project_id
Expand Down
2 changes: 1 addition & 1 deletion examples/tf_cloudbuild_builder_simple_github/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ output "cloudbuild_trigger_id" {

output "repository_id" {
description = "ID of the Cloud Build repositories (2nd gen) repository"
value = module.github_connection.cloud_build_repositories_2nd_gen_connection
value = module.git_repo_connection.cloud_build_repositories_2nd_gen_connection
}

output "project_id" {
Expand Down
6 changes: 3 additions & 3 deletions examples/tf_cloudbuild_builder_simple_gitlab/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module "cloudbuilder" {


project_id = module.enabled_google_apis.project_id
dockerfile_repo_uri = module.github_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
dockerfile_repo_uri = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
dockerfile_repo_type = "UNKNOWN" // "GITLAB" is not one of the options available so we need to use "UNKNOWN"
use_cloudbuildv2_repository = true
trigger_location = "us-central1"
Expand All @@ -48,10 +48,10 @@ module "cloudbuilder" {
resource "time_sleep" "propagation" {
create_duration = "30s"

depends_on = [module.gitlab_connection]
depends_on = [module.git_repo_connection]
}

module "gitlab_connection" {
module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"

project_id = var.project_id
Expand Down
2 changes: 1 addition & 1 deletion examples/tf_cloudbuild_builder_simple_gitlab/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ output "cloudbuild_trigger_id" {

output "repository_id" {
description = "ID of the Cloud Build repositories (2nd gen) repository"
value = module.gitlab_connection.cloud_build_repositories_2nd_gen_connection
value = module.git_repo_connection.cloud_build_repositories_2nd_gen_connection
}

output "project_id" {
Expand Down
6 changes: 3 additions & 3 deletions examples/tf_cloudbuild_workspace_simple_github/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module "tf_workspace" {

project_id = module.enabled_google_apis.project_id
tf_repo_type = "CLOUDBUILD_V2_REPOSITORY"
tf_repo_uri = module.github_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
tf_repo_uri = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
location = "us-central1"
trigger_location = "us-central1"
create_cloudbuild_sa_name = "tf-gh-${lower(local.gh_name)}"
Expand All @@ -55,10 +55,10 @@ module "tf_workspace" {
resource "time_sleep" "propagation" {
create_duration = "30s"

depends_on = [module.github_connection]
depends_on = [module.git_repo_connection]
}

module "github_connection" {
module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"

project_id = var.project_id
Expand Down
6 changes: 3 additions & 3 deletions examples/tf_cloudbuild_workspace_simple_gitlab/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module "tf_workspace" {

project_id = module.enabled_google_apis.project_id
tf_repo_type = "CLOUDBUILD_V2_REPOSITORY"
tf_repo_uri = module.github_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
tf_repo_uri = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
location = "us-central1"
trigger_location = "us-central1"
artifacts_bucket_name = "tf-configs-build-artifacts-${var.project_id}-gl"
Expand All @@ -54,10 +54,10 @@ module "tf_workspace" {
resource "time_sleep" "propagation" {
create_duration = "30s"

depends_on = [module.gitlab_connection]
depends_on = [module.git_repo_connection]
}

module "gitlab_connection" {
module "git_repo_connection" {
source = "../../modules/cloudbuild_repo_connection"

project_id = var.project_id
Expand Down

0 comments on commit f4946df

Please sign in to comment.