From 441bc2d3958c5bef3d96891579828580a7979cc4 Mon Sep 17 00:00:00 2001 From: abhishek kumar tiwari Date: Fri, 16 Aug 2024 19:36:48 +0000 Subject: [PATCH] chore: Add connections metadata (#629) --- Makefile | 4 ++-- modules/postgresql/metadata.yaml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9e168043..c2571266 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # Make will use bash instead of sh SHELL := /usr/bin/env bash -DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.20 +DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools REGISTRY_URL := gcr.io/cloud-foundation-cicd @@ -68,6 +68,7 @@ docker_test_integration: .PHONY: docker_test_lint docker_test_lint: docker run --rm -it \ + -e ENABLE_BPMETADATA \ -v "$(CURDIR)":/workspace \ $(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \ /usr/local/bin/test_lint.sh @@ -76,7 +77,6 @@ docker_test_lint: .PHONY: docker_generate_docs docker_generate_docs: docker run --rm -it \ - -e ENABLE_BPMETADATA \ -v "$(CURDIR)":/workspace \ $(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \ /bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs' diff --git a/modules/postgresql/metadata.yaml b/modules/postgresql/metadata.yaml index f9381733..b3cbde95 100644 --- a/modules/postgresql/metadata.yaml +++ b/modules/postgresql/metadata.yaml @@ -212,6 +212,18 @@ spec: email = string })) defaultValue: [] + connections: + - source: + source: github.com/terraform-google-modules/terraform-google-service-accounts//modules/simple-sa + version: v4.3.0 + spec: + outputExpr: id + connections: + - source: + source: github.com/GoogleCloudPlatform/terraform-google-cloud-run//modules/v2 + version: v0.13.0 + spec: + outputExpr: service_account_id - name: insights_config description: The insights_config settings for the database. varType: |- @@ -240,6 +252,13 @@ spec: psc_allowed_consumer_projects = optional(list(string), []) }) defaultValue: {} + connections: + - source: + source: github.com/terraform-google-modules/terraform-google-network//modules/vpc + version: v9.1.0 + spec: + outputExpr: network_id + inputPath: private_network - name: maintenance_window_day description: The day of week (1-7) for the Cloud SQL instance maintenance. varType: number