From 7508ef42c674a4dad94917e8c9980c8c75ac8134 Mon Sep 17 00:00:00 2001
From: oleg3790 <oleg.krysko@outlook.com>
Date: Mon, 2 Aug 2021 16:29:19 -0500
Subject: [PATCH] Minor tweaks

---
 .../microservice-cicd/dotnet-on-ecs/apply.sh  | 42 +++++++++++--------
 ...azure-pipelines.yml => azurepipelines.yml} |  0
 2 files changed, 25 insertions(+), 17 deletions(-)
 rename Templates/microservice-cicd/dotnet-on-ecs/{azure-pipelines.yml => azurepipelines.yml} (100%)

diff --git a/Templates/apply-scripts/microservice-cicd/dotnet-on-ecs/apply.sh b/Templates/apply-scripts/microservice-cicd/dotnet-on-ecs/apply.sh
index f6b64b9..b52d70d 100644
--- a/Templates/apply-scripts/microservice-cicd/dotnet-on-ecs/apply.sh
+++ b/Templates/apply-scripts/microservice-cicd/dotnet-on-ecs/apply.sh
@@ -9,16 +9,19 @@ while [ $# -gt 0 ]; do
       azp_app_pool_non_prod="$2"
       ;;
     --ecr_name)
-      ecr_name="$3"
+      ecr_name="$2"
+      ;;
+    --cluster_name)
+      cluster_name="$2"
       ;;
     --terraform_directories)
-      terraform_directories="$4"
+      terraform_directories="$2"
       ;;
     --tfvars_name_np)
-      tfvars_name_np="$5"
+      tfvars_name_np="$2"
       ;;
     --tfvars_name_prod)
-      tfvars_name_prod="$6"
+      tfvars_name_prod="$2"
       ;;
     --out_dir)
       out_dir="$2"
@@ -34,38 +37,43 @@ done
 cd ../../../microservice-cicd/dotnet-on-ecs
 
 mkdir "$out_dir/cicd"
+mkdir "$out_dir/deployment"
 
 ## Variables
 azp_app_pool_non_prod_token=":{azp-app-pool-np}:"
-azp_app_pool_prod_token= ":{azp-app-pool-prod}:"
+azp_app_pool_prod_token=":{azp-app-pool-prod}:"
 ecr_name_token=":{ecr-name}:"
+cluster_name_token=":{cluster-name}:"
 terraform_directories_token=":{terraform-directories}:"
 tfvars_name_np_token=":{tfvars-name-np}:"
 tfvars_name_prod_token=":{tfvars-name-prod}:"
 
 ## Apply
-files="azurepipelines.yml cicd/build-image.sh cicd/ecs-refresh.sh cicd/generate-tag.sh cicd/infrastrucutre-apply.sh cicd/push-image.sh deployment/revert.sh"
+files="azurepipelines.yml cicd/build-image.sh cicd/ecs-refresh.sh cicd/generate-tag.sh cicd/infrastructure-apply.sh cicd/push-image.sh deployment/revert.sh"
 
 for file in $files
 do
   sed "s/$azp_app_pool_non_prod_token/$azp_app_pool_non_prod/" $file > "$out_dir/$file"
   sed -i "s/$azp_app_pool_prod_token/$azp_app_pool_prod/" "$out_dir/$file"
   sed -i "s/$ecr_name_token/$ecr_name/" "$out_dir/$file"
+  sed -i "s/$cluster_name_token/$cluster_name/" "$out_dir/$file"
   sed -i "s/$terraform_directories_token/$terraform_directories/" "$out_dir/$file"
   sed -i "s/$tfvars_name_np_token/$tfvars_name_np/" "$out_dir/$file"
   sed -i "s/$tfvars_name_prod_token/$tfvars_name_prod/" "$out_dir/$file"
 
-  # Add git file permissions (will fail if the files were not added to a git dir location)
-  if [[ "$file" == "cicd/build-image.sh"
-        || "$file" == "cicd/ecs-refresh.sh"
-        || "$file" == "cicd/generate-tag.sh "
-        || "$file" == "cicd/infrastrucutre-apply.sh"
-        || "$file" == "cicd/push-image.sh"
-     ]]; then
-    echo "Updating git file permissions for $file"
-    cd $out_dir
-    git add $file
-    git update-index --chmod=+x $file
+  # Add git file permissions
+  if [[ -d "$out_dir/.git" ]]; then
+    if [[ "$file" == "cicd/build-image.sh"
+          || "$file" == "cicd/ecs-refresh.sh"
+          || "$file" == "cicd/generate-tag.sh "
+          || "$file" == "cicd/infrastrucutre-apply.sh"
+          || "$file" == "cicd/push-image.sh"
+      ]]; then
+      echo "Updating git file permissions for $file"
+      cd $out_dir
+      git add $file
+      git update-index --chmod=+x $file
+    fi
   fi
 done
 
diff --git a/Templates/microservice-cicd/dotnet-on-ecs/azure-pipelines.yml b/Templates/microservice-cicd/dotnet-on-ecs/azurepipelines.yml
similarity index 100%
rename from Templates/microservice-cicd/dotnet-on-ecs/azure-pipelines.yml
rename to Templates/microservice-cicd/dotnet-on-ecs/azurepipelines.yml