From 4671142e0651b5f33747d6bde65cba6f3cb8cbb5 Mon Sep 17 00:00:00 2001
From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com>
Date: Mon, 29 Jun 2020 12:39:10 -0500
Subject: [PATCH 1/2] adding logic to deploy major tag versions as well
 Co-authored-by: Thomas Hughes <iamhughes@github.com> Co-authored-by: John
 Wiebalk <jwiebalk@github.com>

---
 .automation/upload-docker.sh | 81 +++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 2 deletions(-)

diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh
index fe1414d3..eefb5c50 100755
--- a/.automation/upload-docker.sh
+++ b/.automation/upload-docker.sh
@@ -26,6 +26,8 @@ REGISTRY="${REGISTRY}"                  # What registry to upload | <GPR> or <Do
 IMAGE_REPO="${IMAGE_REPO}"              # Image repo to upload the image
 IMAGE_VERSION="${IMAGE_VERSION}"        # Version to tag the image
 DOCKERFILE_PATH="${DOCKERFILE_PATH}"    # Path to the Dockerfile to be uploaded
+MAJOR_TAG=''                            # Major tag version if we need to update it
+UPDATE_MAJOR_TAG=0                      # Flag to deploy the major tag version as well
 
 ################################################################################
 ############################ FUNCTIONS BELOW ###################################
@@ -194,6 +196,30 @@ ValidateInput()
     echo "Successfully found:[IMAGE_VERSION], value:[$IMAGE_VERSION]"
   fi
 
+  ##################################
+  # Set regex for getting tag info #
+  ##################################
+  REGEX='(v[0-9]+\.[0-9]+\.[0-9]+)' # Matches 'v1.2.3'
+
+  ######################################################################
+  # Check if this is a latest to a versioned release at create new tag #
+  ######################################################################
+  if [[ "$IMAGE_VERSION" =~ $REGEX ]]; then
+    # Need to get the major version, and set flag to update
+
+    #####################
+    # Set the major tag #
+    #####################
+    MAJOR_TAG=$(echo "$IMAGE_VERSION" | cut -d '.' -f1)
+
+    ###################################
+    # Set flag for updating major tag #
+    ###################################
+    UPDATE_MAJOR_TAG=1
+
+    echo "- Also deploying a major tag of:[$MAJOR_TAG]"
+  fi
+
   ############################
   # Validate DOCKERFILE_PATH #
   ############################
@@ -293,7 +319,31 @@ BuildImage()
   else
     # SUCCESS
     echo "Successfully Built image!"
-    echo "Info:[$BUILD_CMD]"
+  fi
+
+  ########################################################
+  # Need to see if we need to tag a major update as well #
+  ########################################################
+  if [ $UPDATE_MAJOR_TAG -eq 1 ]; then
+    # Tag the image with the major tag as well
+    docker build -t "$IMAGE_REPO:$MAJOR_TAG" -f "$DOCKERFILE_PATH" . 2>&1
+
+    #######################
+    # Load the error code #
+    #######################
+    ERROR_CODE=$?
+
+    ##############################
+    # Check the shell for errors #
+    ##############################
+    if [ $ERROR_CODE -ne 0 ]; then
+      # ERROR
+      echo "ERROR! failed to [tag] Dockerfile!"
+      exit 1
+    else
+      # SUCCESS
+      echo "Successfully tagged image!"
+    fi
   fi
 }
 ################################################################################
@@ -328,7 +378,7 @@ UploadImage()
     exit 1
   else
     # SUCCESS
-    echo "Successfully Uploaded Docker image to $REGISTRY!"
+    echo "Successfully Uploaded Docker image:[$IMAGE_VERSION] to $REGISTRY!"
   fi
 
   #########################
@@ -371,6 +421,33 @@ UploadImage()
     echo "Size:[$SIZE]"
     echo "----------------------------------------------"
   fi
+
+  ###############################################################
+  # Check if we need to upload the major tagged version as well #
+  ###############################################################
+  if [ $UPDATE_MAJOR_TAG -eq 1 ]; then
+    ############################################
+    # Upload the docker image that was created #
+    ############################################
+    docker push "$IMAGE_REPO:$MAJOR_TAG" 2>&1
+
+    #######################
+    # Load the error code #
+    #######################
+    ERROR_CODE=$?
+
+    ##############################
+    # Check the shell for errors #
+    ##############################
+    if [ $ERROR_CODE -ne 0 ]; then
+      # ERROR
+      echo "ERROR! failed to [upload] MAJOR_TAG:[$MAJOR_TAG] Dockerfile!"
+      exit 1
+    else
+      # SUCCESS
+      echo "Successfully Uploaded TAGOR_TAG:[$MAJOR_TAG] Docker image to $REGISTRY!"
+    fi
+  fi
 }
 ################################################################################
 #### Function Footer ###########################################################

From efb491d6cf17d956aed94dfa66e726e8e82305f2 Mon Sep 17 00:00:00 2001
From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com>
Date: Mon, 29 Jun 2020 12:52:36 -0500
Subject: [PATCH 2/2] fixed protobuf var Co-authored-by: Thomas Hughes
 <iamhughes@github.com> Co-authored-by: John Wiebalk <jwiebalk@github.com>

---
 lib/linter.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/linter.sh b/lib/linter.sh
index dea50fab..1981e71a 100755
--- a/lib/linter.sh
+++ b/lib/linter.sh
@@ -85,7 +85,7 @@ LINTER_ARRAY=("jsonlint" "yamllint" "xmllint" "markdownlint" "shellcheck"
 LANGUAGE_ARRAY=('YML' 'JSON' 'XML' 'MARKDOWN' 'BASH' 'PERL' 'PHP' 'RUBY' 'PYTHON'
   'COFFEESCRIPT' 'ANSIBLE' 'JAVASCRIPT_STANDARD' 'JAVASCRIPT_ES'
   'TYPESCRIPT_STANDARD' 'TYPESCRIPT_ES' 'DOCKER' 'GO' 'TERRAFORM'
-  'CSS' 'ENV' 'POWERSHELL' 'KOTLIN' 'PROTO' 'CLOJURE' 'OPENAPI')
+  'CSS' 'ENV' 'POWERSHELL' 'KOTLIN' 'PROTOBUF' 'CLOJURE' 'OPENAPI')
 
 ###################
 # GitHub ENV Vars #
@@ -607,11 +607,6 @@ Footer()
     ###########################
     ERROR_COUNTER="ERRORS_FOUND_$LANGUAGE"
 
-    #################################
-    # Fix Integer Expression errors #
-    #################################
-    ERROR_COUNTER="${ERROR_COUNTER/.*}"
-
     ##################
     # Print if not 0 #
     ##################