chore: Add connection metadata (#227)

GoogleCloudPlatform · Aug 13, 2024 · af012cf · af012cf
1 parent de9ee71
commit af012cf
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -26,6 +26,7 @@ REGISTRY_URL := gcr.io/cloud-foundation-cicd
 .PHONY: docker_test_lint
 docker_test_lint:
 	docker run --rm -it \
+		-e ENABLE_BPMETADATA \
 		-e ENABLE_PARALLEL=1 \
         -e DISABLE_TFLINT=1 \
 		-v $(CURDIR):/workspace \
@@ -36,7 +37,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/v2/metadata.yaml b/modules/v2/metadata.yaml
@@ -135,6 +135,31 @@ spec:
               }), null)
             }))
         required: true
+        connections:
+        - source:
+            source: github.com/terraform-google-modules/terraform-google-memorystore
+            version: v10.0.0
+          spec:
+            outputExpr: env_vars
+            inputPath: env_vars
+        - source:
+            source: github.com/terraform-google-modules/terraform-google-sql-db//modules/postgresql
+            version: v21.0.0
+          spec:
+            outputExpr: env_vars
+            inputPath: env_vars
+        - source:
+            source: github.com/terraform-google-modules/terraform-google-service-accounts//modules/simple-sa
+            version: v4.2.3
+          spec:
+            outputExpr: env_vars
+            inputPath: env_vars
+        - source:
+            source: github.com/GoogleCloudPlatform/terraform-google-cloud-run///modules/v2
+            version: v0.12.0
+          spec:
+            outputExpr: "{ \"SERVICE_ENDPOINT\": service_uri }"
+            inputPath: env_vars
       - name: create_service_account
         description: Create a new service account for cloud run service
         varType: bool
@@ -181,6 +206,12 @@ spec:
       - name: service_account
         description: Email address of the IAM service account associated with the revision of the service
         varType: string
+        connections:
+        - source:
+            source: github.com/terraform-google-modules/terraform-google-service-accounts//modules/simple-sa
+            version: v4.2.3
+          spec:
+            outputExpr: email
       - name: service_account_project_roles
         description: Roles to grant to the newly created cloud run SA in specified project. Should be used with create_service_account set to true and no input for service_account
         varType: list(string)
@@ -267,6 +298,13 @@ spec:
               }))
             }))
         defaultValue: []
+        connections:
+        - source:
+            source: github.com/q2w/terraform-google-sql-db//modules/postgresql
+            version: v21.0.0
+          spec:
+            outputExpr: instance_connection_name
+            inputPath: cloud_sql_instance.instances
       - name: vpc_access
         description: VPC Access configuration to use for this Task. For more information, visit https://cloud.google.com/run/docs/configuring/connecting-vpc
         varType: |-
@@ -280,6 +318,13 @@ spec:
               }))
             })
         defaultValue: {}
+        connections:
+        - source:
+            source: github.com/terraform-google-modules/terraform-google-network//modules/vpc-serverless-connector-beta
+            version: v9.1.0
+          spec:
+            outputExpr: one(connector_ids)
+            inputPath: connector
     outputs:
       - name: creator
         description: Email address of the authenticated creator.