From 0343db7040c2d6ad72f29f6a76f4fd95d897f60d Mon Sep 17 00:00:00 2001
From: Osman Mazinov <53472807+omazin@users.noreply.github.com>
Date: Fri, 7 Feb 2020 22:39:32 +0300
Subject: [PATCH] chore: Remove make_source.sh. Update Makefile, build files.
 (#18)

---
 Makefile                   |  2 +-
 build/int.cloudbuild.yaml  |  2 +-
 build/lint.cloudbuild.yaml |  2 +-
 test/setup/make_source.sh  | 24 ------------------------
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100755 test/setup/make_source.sh

diff --git a/Makefile b/Makefile
index 20f2417..119368b 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 := 0.4.2
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index 3fb3fa0..4761162 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -38,4 +38,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.4.2'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
index f7638fa..9de7ade 100644
--- a/build/lint.cloudbuild.yaml
+++ b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.4.2'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
diff --git a/test/setup/make_source.sh b/test/setup/make_source.sh
deleted file mode 100755
index ae7798a..0000000
--- a/test/setup/make_source.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2018 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.
-
-echo "#!/usr/bin/env bash" > ../source.sh
-
-project_id=$(terraform output project_id)
-echo "export TF_VAR_project_id='$project_id'" >> ../source.sh
-
-sa_json=$(terraform output sa_key)
-# shellcheck disable=SC2086,SC2129
-echo "export SERVICE_ACCOUNT_JSON='$(echo $sa_json | base64 --decode)'" >> ../source.sh