Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: lint for dev-tools and CI #839

Merged
merged 1 commit into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Make will use bash instead of sh
SHELL := /usr/bin/env bash

DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.16
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
REGISTRY_URL := gcr.io/cloud-foundation-cicd

Expand Down
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ tags:
- 'integration'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
options:
machineType: 'N1_HIGHCPU_8'
env:
Expand Down
2 changes: 1 addition & 1 deletion build/lint.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ tags:
- 'lint'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
6 changes: 3 additions & 3 deletions modules/core_project_factory/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ output "service_account_unique_id" {

output "project_bucket_name" {
description = "The name of the projec's bucket"
value = google_storage_bucket.project_bucket.*.name
value = google_storage_bucket.project_bucket[*].name
}

output "project_bucket_self_link" {
value = google_storage_bucket.project_bucket.*.self_link
value = google_storage_bucket.project_bucket[*].self_link
description = "Project's bucket selfLink"
}

output "project_bucket_url" {
value = google_storage_bucket.project_bucket.*.url
value = google_storage_bucket.project_bucket[*].url
description = "Project's bucket url"
}

Expand Down
2 changes: 1 addition & 1 deletion modules/gsuite_enabled/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module "project-factory" {

group_email = element(
compact(
concat(gsuite_group.group.*.email, [module.gsuite_group.email]),
concat(gsuite_group.group[*].email, [module.gsuite_group.email]),
),
0,
)
Expand Down
2 changes: 1 addition & 1 deletion modules/gsuite_group/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

locals {
domain_list = concat(data.google_organization.org.*.domain, ["dummy"])
domain_list = concat(data.google_organization.org[*].domain, ["dummy"])
domain = var.domain == "" ? element(local.domain_list, 0) : var.domain
email = var.name == "" ? "" : format("%s@%s", var.name, local.domain)
}
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/shared_vpc_no_subnets/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ terraform {
version = "~> 3.0"
}
gsuite = {
source = "hashicorp/gsuite"
version = "~> 0.1.12"
}
}
Expand Down