From 0c2251ea4612d74255b549518b8e2a9f3d1c52bd Mon Sep 17 00:00:00 2001
From: m-okeefe <megan037@gmail.com>
Date: Tue, 29 Jan 2019 09:20:21 -0800
Subject: [PATCH] sed regex now accounts for trailing whitespace

---
 hack/README.md                         |  4 +--
 hack/make-release-artifacts.sh         |  4 +--
 hack/restore-release-artifacts.sh      | 35 --------------------------
 release/kubernetes-manifests/demo.yaml |  1 +
 4 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100755 hack/restore-release-artifacts.sh

diff --git a/hack/README.md b/hack/README.md
index 8deb56f..d949e34 100755
--- a/hack/README.md
+++ b/hack/README.md
@@ -15,6 +15,4 @@ releases.
 1. `./make-docker-images.sh`: builds and pushes images to the specified Docker repository.
 2. `./make-release-artifacts.sh`: injects updated images/tag into 
    `./release/kubernetes-manifests/demo.yaml`. 
-3. `./restore-release-artifacts.sh`: restores image names/tags in `demo.yaml` to defaults
-   (`adservice`, `cartservice`, etc.) 
-4. `./make-release.sh`: runs scripts 1 and 2, then runs `git tag` / pushes updated manifests to master.
+3. `./make-release.sh`: runs scripts 1 and 2, then runs `git tag` / pushes updated manifests to master.
diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh
index 3a572dc..2172809 100755
--- a/hack/make-release-artifacts.sh
+++ b/hack/make-release-artifacts.sh
@@ -32,8 +32,8 @@ do
     svcname="$(basename $dir)"
     image="$REPO_PREFIX/$svcname:$TAG"
 
-    pattern="^[[:blank:]]*image:.*$svcname.*"
-    replace="        image: $image"
+    pattern="^\([[:blank:]]*\)image:[[:blank:]].*$svcname\(.*\)\([[:blank:]]*\)"
+    replace="\1image: $image\3"  
     sed -i '' "s|$pattern|$replace|g" $manifestfile 
 done
 
diff --git a/hack/restore-release-artifacts.sh b/hack/restore-release-artifacts.sh
deleted file mode 100755
index 786cce7..0000000
--- a/hack/restore-release-artifacts.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019 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.
-
-
-# Restores images ./release/kubernetes-manifests/demo.yaml to match ./kubernetes-manifests
-
-#!/usr/bin/env bash
-set -euo pipefail
-
-log() { echo "$1" >&2; }
-fail() { log "$1"; exit 1; }
-
-manifestfile="./release/kubernetes-manifests/demo.yaml"
-
-# restore release/ manifest images to skaffold default, eg. "adservice"
-for dir in ./src/*/    
-do
-    svcname=$(basename $dir)
-    pattern="^[[:blank:]]*image:.*$svcname.*"
-    replace="        image: $svcname"
-    sed -i '' "s|$pattern|$replace|g" $manifestfile 
-done
-
-log "Restored demo.yaml."
diff --git a/release/kubernetes-manifests/demo.yaml b/release/kubernetes-manifests/demo.yaml
index 4e9dec1..6b0e498 100644
--- a/release/kubernetes-manifests/demo.yaml
+++ b/release/kubernetes-manifests/demo.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata: