Merge pull request #359 from GoogleCloudPlatform/refactor/terraform-b…

…uild-resources

refactor: remove build steps from terraform module

bq-workers/github-parser/cloudbuild.yaml

@@ -25,16 +25,6 @@ steps:
   waitFor: build
   id: push
 
-- # Deploy to Cloud Run
-  name: google/cloud-sdk
-  args: ['gcloud', 'run', 'deploy', 'github-parser',
-         '--image', 'gcr.io/$PROJECT_ID/github-parser:${_TAG}',
-         '--region', '${_REGION}',
-         '--platform', 'managed'
-  ]
-  id: deploy
-  waitFor: push
-
 images: [
   'gcr.io/$PROJECT_ID/github-parser:${_TAG}'
 ]

bq-workers/parsers.cloudbuild.yaml

@@ -0,0 +1,33 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+steps:
+- # Build parser image
+  name: gcr.io/cloud-builders/docker:latest
+  dir: ${_SERVICE}-parser
+  args: ['build', 
+         '--tag=gcr.io/$PROJECT_ID/${_SERVICE}-parser:${_TAG}', '.']
+  id: build
+
+- # Push the container image to Container Registry
+  name: gcr.io/cloud-builders/docker
+  args: ['push', 'gcr.io/$PROJECT_ID/${_SERVICE}-parser:${_TAG}']
+  waitFor: build
+  id: push
+
+images: [
+  'gcr.io/$PROJECT_ID/${_SERVICE}-parser:${_TAG}'
+]
+substitutions:
+  _TAG: latest

ci/e2e_terraform_module_test.cloudbuild.yaml

@@ -53,7 +53,7 @@ steps:
         bigquery_region="US"
         event_handler_container_url="gcr.io/$_TARGET_PROJECT/event-handler:$SHORT_SHA"
         dashboard_container_url="gcr.io/$_TARGET_PROJECT/dashboard:$SHORT_SHA"
-        parser_container_urls={"github":"gcr.io/$_TARGET_PROJECT/github-parser:$SHORT_SHA"}
+        github_parser_url="gcr.io/$_TARGET_PROJECT/github-parser:$SHORT_SHA"
       }
       EOF
   waitFor: ['-']

dashboard/cloudbuild.yaml

@@ -24,18 +24,7 @@ steps:
   args: ['push', 'gcr.io/$PROJECT_ID/fourkeys-grafana-dashboard:${_TAG}']
   id: push
 
-- # Deploy to Cloud Run
-  name: google/cloud-sdk
-  args: ['gcloud', 'run', 'deploy', 'fourkeys-grafana-dashboard',
-         '--image', 'gcr.io/$PROJECT_ID/fourkeys-grafana-dashboard:${_TAG}',
-         '--region', '${_REGION}',
-         '--platform', 'managed', '--port', '3000',
-         '--allow-unauthenticated'
-  ]
-  id: deploy
-
 # Read more about substitutions 
 # https://cloud.google.com/build/docs/configuring-builds/substitute-variable-values
 substitutions:
   _TAG: latest
-  _REGION: us-central1

event-handler/cloudbuild.yaml

@@ -24,18 +24,8 @@ steps:
   waitFor: build
   id: push
 
-- # Deploy to Cloud Run
-  name: gcr.io/google.com/cloudsdktool/cloud-sdk:slim
-  args: ['gcloud', 'run', 'deploy', 'event-handler',
-         '--image', 'gcr.io/$PROJECT_ID/event-handler:${_TAG}',
-         '--region', '${_REGION}',
-         '--platform', 'managed',
-         '--allow-unauthenticated',
-         '--set-env-vars', 'PROJECT_NAME=$PROJECT_ID'
-  ]
-  id: deploy
-  waitFor: push
-
 images: [
   'gcr.io/$PROJECT_ID/event-handler:${_TAG}'
 ]
+substitutions:
+  _TAG: latest