fix version parsing

Author: harryhmc

azure/templates/deploy-service.yml

@@ -122,7 +122,6 @@ steps:
     - bash: |
         set -euo pipefail
 
-        echo "Setting variables"
         export SERVICE_NAME="${{ parameters.service_name }}"
         export PROXIES_DIR="$(SERVICE_DIR)/proxies"
         export SERVICE_BASE_PATH="${{ parameters.service_base_path }}"
@@ -132,28 +131,21 @@ steps:
         export SOURCE_COMMIT_ID=$(Build.SourceVersion)
         export RELEASE_RELEASEID=$(Build.BuildId)
 
-        echo "Setting assumed version"
         export ASSUMED_VERSION=`echo $SERVICE_ARTIFACT_NAME | ( grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" || true ) | tail -1`
-        echo "Setting deployed version"
         if [[ ! -z $ASSUMED_VERSION ]]; then
-          echo "Setting deployed=assumed"
           export DEPLOYED_VERSION=$ASSUMED_VERSION
         else
-          echo "Setting FQSN"
           export DEPLOYED_VERSION="${{ parameters.fully_qualified_service_name }}"
         fi
 
-        echo "Sourcing build vars"
         if [ -f  $(SERVICE_DIR)/.build_env_vars ]; then
           source $(SERVICE_DIR)/.build_env_vars
         fi
 
-        echo "Templating proxies"
         cd $(UTILS_DIR)
         ANSIBLE_FORCE_COLOR=yes \
         make --no-print-directory -C ansible template-proxies
 
-        echo "Adding GUIDS policy"
         if [ -f $(SERVICE_DIR)/manifest.yml ]; then
             DIST_DIR=$(SERVICE_DIR) \
             PROXY_DIR=${{ parameters.proxy_path }} \
@@ -211,8 +203,9 @@ steps:
 
       source $(SERVICE_DIR)/.build_env_vars
 
-      if [[ $SERVICE_ARTIFACT_NAME == v* ]]; then
-        export DEPLOYED_VERSION=`echo $SERVICE_ARTIFACT_NAME | grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" | tail -1`
+      export ASSUMED_VERSION=`echo $SERVICE_ARTIFACT_NAME | ( grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" || true ) | tail -1`
+      if [[ ! -z $ASSUMED_VERSION ]]; then
+        export DEPLOYED_VERSION=$ASSUMED_VERSION
       else
         export DEPLOYED_VERSION="${{ parameters.fully_qualified_service_name }}"
       fi