From ab7816e3922393477c4f3c7966f6fe3040ef7cc9 Mon Sep 17 00:00:00 2001
From: Yvonne Radsmikham <yvonne.radsmikham@gmail.com>
Date: Fri, 6 Mar 2020 17:49:49 -0800
Subject: [PATCH 1/4] Refactor fab set to set image tag in service directory
 config file

---
 src/lib/fileutils.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/fileutils.ts b/src/lib/fileutils.ts
index 35214a004..94f6f301e 100644
--- a/src/lib/fileutils.ts
+++ b/src/lib/fileutils.ts
@@ -298,7 +298,9 @@ export const serviceBuildAndUpdatePipeline = (
                   `echo "Image Name: $IMAGE_NAME"`,
                   `export IMAGE_REPO=${IMAGE_REPO}`,
                   `echo "Image Repository: $IMAGE_REPO"`,
-                  `../fab/fab set --subcomponent $(Build.Repository.Name).$FAB_SAFE_SERVICE_NAME.${SAFE_SOURCE_BRANCH}.chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
+                  `cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME`,
+                  `echo "FAB SET"`,
+                  `fab set --subcomponent $(Build.Repository.Name).$FAB_SAFE_SERVICE_NAME.${SAFE_SOURCE_BRANCH}.chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
                   `echo "GIT STATUS"`,
                   `git status`,
                   `echo "GIT ADD (git add -A)"`,

From f3a3e0696b617ed96929333251c08b01bb79fb58 Mon Sep 17 00:00:00 2001
From: Yvonne Radsmikham <yvonne.radsmikham@gmail.com>
Date: Mon, 9 Mar 2020 09:55:25 -0700
Subject: [PATCH 2/4] resolved unit tests

---
 src/test/mockFactory.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/mockFactory.ts b/src/test/mockFactory.ts
index 62a05d6b3..3e9afe804 100644
--- a/src/test/mockFactory.ts
+++ b/src/test/mockFactory.ts
@@ -139,7 +139,9 @@ export const createTestServiceBuildAndUpdatePipelineYaml = (
                   `echo "Image Name: $IMAGE_NAME"`,
                   `export IMAGE_REPO=${IMAGE_REPO}`,
                   `echo "Image Repository: $IMAGE_REPO"`,
-                  `../fab/fab set --subcomponent $(Build.Repository.Name).$FAB_SAFE_SERVICE_NAME.${SAFE_SOURCE_BRANCH}.chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
+                  `cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME`,
+                  `echo "FAB SET"`,
+                  `fab set --subcomponent $(Build.Repository.Name).$FAB_SAFE_SERVICE_NAME.${SAFE_SOURCE_BRANCH}.chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
                   `echo "GIT STATUS"`,
                   `git status`,
                   `echo "GIT ADD (git add -A)"`,

From da77eda6bd3da270d9bf070d815ff4b5c1ae7ee5 Mon Sep 17 00:00:00 2001
From: Yvonne Radsmikham <yvonne.radsmikham@gmail.com>
Date: Mon, 9 Mar 2020 13:29:00 -0700
Subject: [PATCH 3/4] generate config in ring directory

---
 src/lib/fileutils.ts    | 4 ++--
 src/test/mockFactory.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/fileutils.ts b/src/lib/fileutils.ts
index 94f6f301e..9f4c9a286 100644
--- a/src/lib/fileutils.ts
+++ b/src/lib/fileutils.ts
@@ -298,9 +298,9 @@ export const serviceBuildAndUpdatePipeline = (
                   `echo "Image Name: $IMAGE_NAME"`,
                   `export IMAGE_REPO=${IMAGE_REPO}`,
                   `echo "Image Repository: $IMAGE_REPO"`,
-                  `cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME`,
+                  `cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME/${SAFE_SOURCE_BRANCH}`,
                   `echo "FAB SET"`,
-                  `fab set --subcomponent $(Build.Repository.Name).$FAB_SAFE_SERVICE_NAME.${SAFE_SOURCE_BRANCH}.chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
+                  `fab set --subcomponent chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
                   `echo "GIT STATUS"`,
                   `git status`,
                   `echo "GIT ADD (git add -A)"`,
diff --git a/src/test/mockFactory.ts b/src/test/mockFactory.ts
index 3e9afe804..87d807d51 100644
--- a/src/test/mockFactory.ts
+++ b/src/test/mockFactory.ts
@@ -139,9 +139,9 @@ export const createTestServiceBuildAndUpdatePipelineYaml = (
                   `echo "Image Name: $IMAGE_NAME"`,
                   `export IMAGE_REPO=${IMAGE_REPO}`,
                   `echo "Image Repository: $IMAGE_REPO"`,
-                  `cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME`,
+                  `cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME/${SAFE_SOURCE_BRANCH}`,
                   `echo "FAB SET"`,
-                  `fab set --subcomponent $(Build.Repository.Name).$FAB_SAFE_SERVICE_NAME.${SAFE_SOURCE_BRANCH}.chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
+                  `fab set --subcomponent chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
                   `echo "GIT STATUS"`,
                   `git status`,
                   `echo "GIT ADD (git add -A)"`,

From 75645a333cf13953bfa3f6db597a817821ec0fd0 Mon Sep 17 00:00:00 2001
From: Yvonne Radsmikham <yvonne.radsmikham@gmail.com>
Date: Mon, 9 Mar 2020 13:30:42 -0700
Subject: [PATCH 4/4] update branch name regex

---
 src/lib/fileutils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/fileutils.ts b/src/lib/fileutils.ts
index 9f4c9a286..8d6bc1291 100644
--- a/src/lib/fileutils.ts
+++ b/src/lib/fileutils.ts
@@ -73,10 +73,10 @@ export const generateAccessYaml = (
 
 /**
  * Outputs a bash string for a _safe_ source branch string -- a string where all
- * '/' and '.' in the string have been replaced with a '-'`
+ * '/', '.', and '_' in the string have been replaced with a '-'`
  */
 
-export const SAFE_SOURCE_BRANCH = `$(echo $(Build.SourceBranchName) | tr / - | tr . -)`;
+export const SAFE_SOURCE_BRANCH = `$(echo $(Build.SourceBranchName) | tr / - | tr . - | tr _ - )`;
 
 /**
  * Outputs a bash script to generate a _safe_ azure container registry url where it's all lowercase.