File tree Expand file tree Collapse file tree 2 files changed +21
-2
lines changed Expand file tree Collapse file tree 2 files changed +21
-2
lines changed Original file line number Diff line number Diff line change 1818# Make will use bash instead of sh
1919SHELL := /usr/bin/env bash
2020
21- DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.20
21+ DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22
2222DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424
@@ -68,6 +68,7 @@ docker_test_integration:
6868.PHONY : docker_test_lint
6969docker_test_lint :
7070 docker run --rm -it \
71+ -e ENABLE_BPMETADATA \
7172 -v " $( CURDIR) " :/workspace \
7273 $(REGISTRY_URL ) /${DOCKER_IMAGE_DEVELOPER_TOOLS} :${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
7374 /usr/local/bin/test_lint.sh
@@ -76,7 +77,6 @@ docker_test_lint:
7677.PHONY : docker_generate_docs
7778docker_generate_docs :
7879 docker run --rm -it \
79- -e ENABLE_BPMETADATA \
8080 -v " $( CURDIR) " :/workspace \
8181 $(REGISTRY_URL ) /${DOCKER_IMAGE_DEVELOPER_TOOLS} :${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
8282 /bin/bash -c ' source /usr/local/bin/task_helper_functions.sh && generate_docs'
Original file line number Diff line number Diff line change @@ -212,6 +212,18 @@ spec:
212212 email = string
213213 }))
214214 defaultValue : []
215+ connections :
216+ - source :
217+ source : github.com/terraform-google-modules/terraform-google-service-accounts//modules/simple-sa
218+ version : v4.3.0
219+ spec :
220+ outputExpr : id
221+ connections :
222+ - source :
223+ source : github.com/GoogleCloudPlatform/terraform-google-cloud-run//modules/v2
224+ version : v0.13.0
225+ spec :
226+ outputExpr : service_account_id
215227 - name : insights_config
216228 description : The insights_config settings for the database.
217229 varType : |-
@@ -240,6 +252,13 @@ spec:
240252 psc_allowed_consumer_projects = optional(list(string), [])
241253 })
242254 defaultValue : {}
255+ connections :
256+ - source :
257+ source : github.com/terraform-google-modules/terraform-google-network//modules/vpc
258+ version : v9.1.0
259+ spec :
260+ outputExpr : network_id
261+ inputPath : private_network
243262 - name : maintenance_window_day
244263 description : The day of week (1-7) for the Cloud SQL instance maintenance.
245264 varType : number
You can’t perform that action at this time.
0 commit comments