Skip to content

Commit 50e4ea2

Browse files
authored
fix: lint for dev-tools and CI (#839)
1 parent 9381bd5 commit 50e4ea2

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.16
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

build/int.cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ tags:
170170
- 'integration'
171171
substitutions:
172172
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
173-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1'
173+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'
174174
options:
175175
machineType: 'N1_HIGHCPU_8'
176176
env:

build/lint.cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tags:
2121
- 'lint'
2222
substitutions:
2323
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
24-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'

modules/core_project_factory/outputs.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ output "service_account_unique_id" {
6363

6464
output "project_bucket_name" {
6565
description = "The name of the projec's bucket"
66-
value = google_storage_bucket.project_bucket.*.name
66+
value = google_storage_bucket.project_bucket[*].name
6767
}
6868

6969
output "project_bucket_self_link" {
70-
value = google_storage_bucket.project_bucket.*.self_link
70+
value = google_storage_bucket.project_bucket[*].self_link
7171
description = "Project's bucket selfLink"
7272
}
7373

7474
output "project_bucket_url" {
75-
value = google_storage_bucket.project_bucket.*.url
75+
value = google_storage_bucket.project_bucket[*].url
7676
description = "Project's bucket url"
7777
}
7878

modules/gsuite_enabled/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module "project-factory" {
6767

6868
group_email = element(
6969
compact(
70-
concat(gsuite_group.group.*.email, [module.gsuite_group.email]),
70+
concat(gsuite_group.group[*].email, [module.gsuite_group.email]),
7171
),
7272
0,
7373
)

modules/gsuite_group/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
locals {
18-
domain_list = concat(data.google_organization.org.*.domain, ["dummy"])
18+
domain_list = concat(data.google_organization.org[*].domain, ["dummy"])
1919
domain = var.domain == "" ? element(local.domain_list, 0) : var.domain
2020
email = var.name == "" ? "" : format("%s@%s", var.name, local.domain)
2121
}

test/fixtures/shared_vpc_no_subnets/main.tf

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ terraform {
3434
version = "~> 3.0"
3535
}
3636
gsuite = {
37+
source = "hashicorp/gsuite"
3738
version = "~> 0.1.12"
3839
}
3940
}

0 commit comments

Comments
 (0)