From 5142e0aebdc282e6ac73a07d4793e0fa4bd9ff01 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 1 Jul 2020 14:00:05 -0500 Subject: [PATCH 1/6] Add colors to output --- .automation/cleanup-docker.sh | 32 +++++----- .../templates/ghe-config-apply.sh | 12 ++-- .automation/upload-docker.sh | 58 +++++++++---------- lib/buildFileList.sh | 8 +-- lib/linter.sh | 36 ++++++------ lib/termColors.sh | 27 +++++++++ lib/worker.sh | 36 ++++++------ 7 files changed, 119 insertions(+), 90 deletions(-) create mode 100644 lib/termColors.sh diff --git a/.automation/cleanup-docker.sh b/.automation/cleanup-docker.sh index 838119c4..f493bd6c 100755 --- a/.automation/cleanup-docker.sh +++ b/.automation/cleanup-docker.sh @@ -54,8 +54,8 @@ ValidateInput() # Validate GITHUB_WORKSPACE # ############################ if [ -z "$GITHUB_WORKSPACE" ]; then - echo "ERROR! Failed to get [GITHUB_WORKSPACE]!" - echo "ERROR:[$GITHUB_WORKSPACE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]" exit 1 else echo "Successfully found:[GITHUB_WORKSPACE], value:[$GITHUB_WORKSPACE]" @@ -66,8 +66,8 @@ ValidateInput() ####################### if [ -z "$IMAGE_REPO" ]; then # No repo was pulled - echo "ERROR! Failed to get [IMAGE_REPO]!" - echo "ERROR:[$IMAGE_REPO]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_REPO]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_REPO]" exit 1 elif [[ "$IMAGE_REPO" == "github/super-linter" ]]; then # Found our main repo @@ -82,8 +82,8 @@ ValidateInput() # Validate IMAGE_VERSION # ########################## if [ -z "$IMAGE_VERSION" ]; then - echo "ERROR! Failed to get [IMAGE_VERSION]!" - echo "ERROR:[$IMAGE_VERSION]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_VERSION]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_VERSION]" exit 1 else echo "Successfully found:[IMAGE_VERSION], value:[$IMAGE_VERSION]" @@ -93,8 +93,8 @@ ValidateInput() # Validate DOCKER_USERNAME # ############################ if [ -z "$DOCKER_USERNAME" ]; then - echo "ERROR! Failed to get [DOCKER_USERNAME]!" - echo "ERROR:[$DOCKER_USERNAME]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_USERNAME]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_USERNAME]" exit 1 else echo "Successfully found:[DOCKER_USERNAME], value:[$DOCKER_USERNAME]" @@ -104,8 +104,8 @@ ValidateInput() # Validate DOCKER_PASSWORD # ############################ if [ -z "$DOCKER_PASSWORD" ]; then - echo "ERROR! Failed to get [DOCKER_PASSWORD]!" - echo "ERROR:[$DOCKER_PASSWORD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_PASSWORD]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_PASSWORD]" exit 1 else echo "Successfully found:[DOCKER_PASSWORD], value:[********]" @@ -157,8 +157,8 @@ LoginToDocker() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! Failed to authenticate to DockerHub!" - echo "ERROR:[$LOGIN_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to authenticate to DockerHub!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LOGIN_CMD]" exit 1 else # SUCCESS @@ -197,8 +197,8 @@ RemoveImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! Failed to gain token from DockerHub!" - echo "ERROR:[$TOKEN]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain token from DockerHub!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$TOKEN]" exit 1 else # SUCCESS @@ -222,8 +222,8 @@ RemoveImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! Failed to remove tag from DockerHub!" - echo "ERROR:[$REMOVE_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to remove tag from DockerHub!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$REMOVE_CMD]" exit 1 else # SUCCESS diff --git a/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh b/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh index f33f0475..4a25c0ca 100644 --- a/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh +++ b/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh @@ -53,8 +53,8 @@ CheckGHEPid() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ]; then - echo "ERROR! Failed to sleep!" - echo "ERROR:[$SLEEP_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to sleep!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SLEEP_CMD]" echo "Will try to call apply as last effort..." #################################### # Call config apply as last effort # @@ -117,8 +117,8 @@ CheckGHEProcess() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ]; then - echo "ERROR! Failed to sleep!" - echo "ERROR:[$SLEEP_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to sleep!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SLEEP_CMD]" echo "Will try to call apply as last effort..." #################################### # Call config apply as last effort # @@ -161,8 +161,8 @@ RunConfigApply() ############################## if [ $ERROR_CODE -ne 0 ]; then # Errors - echo "ERROR! Failed to run config apply command!" - echo "ERROR:[$APPLY_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to run config apply command!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$APPLY_CMD]" exit 1 else # Success diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh index 55719d6b..03f02a91 100755 --- a/.automation/upload-docker.sh +++ b/.automation/upload-docker.sh @@ -60,8 +60,8 @@ ValidateInput() # Validate GITHUB_WORKSPACE # ############################# if [ -z "$GITHUB_WORKSPACE" ]; then - echo "ERROR! Failed to get [GITHUB_WORKSPACE]!" - echo "ERROR:[$GITHUB_WORKSPACE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]" exit 1 else echo "Successfully found:[GITHUB_WORKSPACE], value:[$GITHUB_WORKSPACE]" @@ -71,8 +71,8 @@ ValidateInput() # Validate REGISTRY # ##################### if [ -z "$REGISTRY" ]; then - echo "ERROR! Failed to get [REGISTRY]!" - echo "ERROR:[$REGISTRY]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [REGISTRY]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$REGISTRY]" exit 1 else echo "Successfully found:[REGISTRY], value:[$REGISTRY]" @@ -86,8 +86,8 @@ ValidateInput() # Validate GPR_USERNAME # ######################### if [ -z "$GPR_USERNAME" ]; then - echo "ERROR! Failed to get [GPR_USERNAME]!" - echo "ERROR:[$GPR_USERNAME]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GPR_USERNAME]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GPR_USERNAME]" exit 1 else echo "Successfully found:[GPR_USERNAME], value:[$GPR_USERNAME]" @@ -97,8 +97,8 @@ ValidateInput() # Validate GPR_TOKEN # ###################### if [ -z "$GPR_TOKEN" ]; then - echo "ERROR! Failed to get [GPR_TOKEN]!" - echo "ERROR:[$GPR_TOKEN]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GPR_TOKEN]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GPR_TOKEN]" exit 1 else echo "Successfully found:[GPR_TOKEN], value:[********]" @@ -111,8 +111,8 @@ ValidateInput() # Validate DOCKER_USERNAME # ############################ if [ -z "$DOCKER_USERNAME" ]; then - echo "ERROR! Failed to get [DOCKER_USERNAME]!" - echo "ERROR:[$DOCKER_USERNAME]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_USERNAME]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_USERNAME]" exit 1 else echo "Successfully found:[DOCKER_USERNAME], value:[$DOCKER_USERNAME]" @@ -122,8 +122,8 @@ ValidateInput() # Validate DOCKER_PASSWORD # ############################ if [ -z "$DOCKER_PASSWORD" ]; then - echo "ERROR! Failed to get [DOCKER_PASSWORD]!" - echo "ERROR:[$DOCKER_PASSWORD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_PASSWORD]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_PASSWORD]" exit 1 else echo "Successfully found:[DOCKER_PASSWORD], value:[********]" @@ -132,7 +132,7 @@ ValidateInput() # We were not passed a registry to update # ########################################### else - echo "ERROR! Failed to find a valid registry!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find a valid registry!" echo "Registry:[$REGISTRY]" exit 1 fi @@ -142,8 +142,8 @@ ValidateInput() # Validate IMAGE_REPO # ####################### if [ -z "$IMAGE_REPO" ]; then - echo "ERROR! Failed to get [IMAGE_REPO]!" - echo "ERROR:[$IMAGE_REPO]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_REPO]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_REPO]" exit 1 else echo "Successfully found:[IMAGE_REPO], value:[$IMAGE_REPO]" @@ -177,8 +177,8 @@ ValidateInput() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ]; then - echo "ERROR! Failed to get branch name!" - echo "ERROR:[$BRANCH_NAME]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get branch name!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$BRANCH_NAME]" exit 1 fi @@ -224,8 +224,8 @@ ValidateInput() # Validate DOCKERFILE_PATH # ############################ if [ -z "$DOCKERFILE_PATH" ]; then - echo "ERROR! Failed to get [DOCKERFILE_PATH]!" - echo "ERROR:[$DOCKERFILE_PATH]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKERFILE_PATH]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKERFILE_PATH]" exit 1 else echo "Successfully found:[DOCKERFILE_PATH], value:[$DOCKERFILE_PATH]" @@ -267,8 +267,8 @@ Authenticate() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! Failed to authenticate to $NAME!" - echo "ERROR:[$LOGIN_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to authenticate to $NAME!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LOGIN_CMD]" exit 1 else # SUCCESS @@ -293,7 +293,7 @@ BuildImage() ################################ if [ ! -f "$DOCKERFILE_PATH" ]; then # No file found - echo "ERROR! failed to find Dockerfile at:[$DOCKERFILE_PATH]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to find Dockerfile at:[$DOCKERFILE_PATH]" echo "Please make sure you give full path!" echo "Example:[/configs/Dockerfile] or [Dockerfile] if at root directory" exit 1 @@ -314,7 +314,7 @@ BuildImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! failed to [build] Dockerfile!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [build] Dockerfile!" exit 1 else # SUCCESS @@ -338,7 +338,7 @@ BuildImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! failed to [tag] Dockerfile!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [tag] Dockerfile!" exit 1 else # SUCCESS @@ -374,7 +374,7 @@ UploadImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! failed to [upload] Dockerfile!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [upload] Dockerfile!" exit 1 else # SUCCESS @@ -397,8 +397,8 @@ UploadImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! Failed to get information about built Image!" - echo "ERROR:[$GET_INFO_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get information about built Image!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GET_INFO_CMD]" exit 1 else ################ @@ -440,7 +440,7 @@ UploadImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! failed to [upload] MAJOR_TAG:[$MAJOR_TAG] Dockerfile!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [upload] MAJOR_TAG:[$MAJOR_TAG] Dockerfile!" exit 1 else # SUCCESS @@ -495,7 +495,7 @@ else ######### # ERROR # ######### - echo "ERROR! Registry not set correctly!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Registry not set correctly!" echo "Registry:[$REGISTRY]" exit 1 fi diff --git a/lib/buildFileList.sh b/lib/buildFileList.sh index c10284c8..d0948419 100755 --- a/lib/buildFileList.sh +++ b/lib/buildFileList.sh @@ -39,7 +39,7 @@ function BuildFileList() if [ $ERROR_CODE -ne 0 ]; then # Error echo "Failed to switch to $DEFAULT_BRANCH branch to get files changed!" - echo "ERROR:[$SWITCH_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SWITCH_CMD]" exit 1 fi @@ -67,8 +67,8 @@ function BuildFileList() ############################## if [ $ERROR_CODE -ne 0 ]; then # Error - echo "ERROR! Failed to gain a list of all files changed!" - echo "ERROR:[${RAW_FILE_ARRAY[*]}]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain a list of all files changed!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[${RAW_FILE_ARRAY[*]}]" exit 1 fi @@ -429,7 +429,7 @@ function BuildFileList() if [ $ERROR_CODE -ne 0 ]; then # Error echo "Failed to switch back to branch!" - echo "ERROR:[$SWITCH2_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SWITCH2_CMD]" exit 1 fi diff --git a/lib/linter.sh b/lib/linter.sh index 0801a9ee..01e937d3 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -10,6 +10,8 @@ # Source Function Files # ######################### # shellcheck source=/dev/null +source /action/lib/termColors.sh # Source the function script(s) +# shellcheck source=/dev/null source /action/lib/buildFileList.sh # Source the function script(s) # shellcheck source=/dev/null source /action/lib/validation.sh # Source the function script(s) @@ -322,8 +324,8 @@ GetLinterRules() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ]; then - echo "ERROR! Failed to set file:[$FILE_NAME] as default!" - echo "ERROR:[$CP_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to set file:[$FILE_NAME] as default!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$CP_CMD]" exit 1 fi else @@ -373,8 +375,8 @@ GetStandardRules() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo "ERROR! Failed to gain list of ENV vars to load!" - echo "ERROR:[${GET_ENV_ARRAY[*]}]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain list of ENV vars to load!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[${GET_ENV_ARRAY[*]}]" exit 1 fi @@ -575,8 +577,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_SHA" ]; then - echo "ERROR! Failed to get [GITHUB_SHA]!" - echo "ERROR:[$GITHUB_SHA]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_SHA]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_SHA]" exit 1 else echo "Successfully found:[GITHUB_SHA], value:[$GITHUB_SHA]" @@ -586,8 +588,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_WORKSPACE" ]; then - echo "ERROR! Failed to get [GITHUB_WORKSPACE]!" - echo "ERROR:[$GITHUB_WORKSPACE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]" exit 1 else echo "Successfully found:[GITHUB_WORKSPACE], value:[$GITHUB_WORKSPACE]" @@ -597,8 +599,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_EVENT_PATH" ]; then - echo "ERROR! Failed to get [GITHUB_EVENT_PATH]!" - echo "ERROR:[$GITHUB_EVENT_PATH]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_EVENT_PATH]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_EVENT_PATH]" exit 1 else echo "Successfully found:[GITHUB_EVENT_PATH], value:[$GITHUB_EVENT_PATH]" @@ -617,8 +619,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_ORG" ]; then - echo "ERROR! Failed to get [GITHUB_ORG]!" - echo "ERROR:[$GITHUB_ORG]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_ORG]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_ORG]" exit 1 else echo "Successfully found:[GITHUB_ORG], value:[$GITHUB_ORG]" @@ -633,8 +635,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_REPO" ]; then - echo "ERROR! Failed to get [GITHUB_REPO]!" - echo "ERROR:[$GITHUB_REPO]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_REPO]!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_REPO]" exit 1 else echo "Successfully found:[GITHUB_REPO], value:[$GITHUB_REPO]" @@ -668,7 +670,7 @@ Footer() ################## if [ "${!ERROR_COUNTER}" -ne 0 ]; then # Print the goods - echo "ERRORS FOUND in $LANGUAGE:[${!ERROR_COUNTER}]" + echo -e "${NC}${B[R]}${F[W]}ERRORS FOUND${NC} in $LANGUAGE:[${!ERROR_COUNTER}]" fi done @@ -676,7 +678,7 @@ Footer() # Exit with 0 if errors disabled # ################################## if [ "$DISABLE_ERRORS" == "true" ]; then - echo "WARN! Exiting with exit code:[0] as:[DISABLE_ERRORS] was set to:[$DISABLE_ERRORS]" + echo -e "${NC}${F[Y]}WARN!${NC} Exiting with exit code:[0] as:[DISABLE_ERRORS] was set to:[$DISABLE_ERRORS]" exit 0 ############################### # Exit with 1 if errors found # @@ -715,7 +717,7 @@ Footer() # Footer prints # ################# echo "" - echo "All file(s) linted successfully with no errors detected" + echo -e "${NC}${F[G]}All file(s) linted successfully with no errors detected${NC}" echo "----------------------------------------------" echo "" # Successful exit diff --git a/lib/termColors.sh b/lib/termColors.sh new file mode 100644 index 00000000..ce3e0e66 --- /dev/null +++ b/lib/termColors.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +declare -Agr B=( + [B]=$(echo -e "\e[44m") + [C]=$(echo -e "\e[46m") + [G]=$(echo -e "\e[42m") + [K]=$(echo -e "\e[40m") + [M]=$(echo -e "\e[45m") + [R]=$(echo -e "\e[41m") + [W]=$(echo -e "\e[47m") + [Y]=$(echo -e "\e[43m") +) +declare -Agr F=( + [B]=$(echo -e "\e[0;34m") + [C]=$(echo -e "\e[0;36m") + [G]=$(echo -e "\e[0;32m") + [K]=$(echo -e "\e[0;30m") + [M]=$(echo -e "\e[0;35m") + [R]=$(echo -e "\e[0;31m") + [W]=$(echo -e "\e[0;37m") + [Y]=$(echo -e "\e[0;33m") +) +readonly NC=$(echo -e "\e[0m") + +export B +export F +export NC diff --git a/lib/worker.sh b/lib/worker.sh index fc1d65f1..b58324a6 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -50,8 +50,8 @@ function LintCodebase() ############################## if [ $ERROR_CODE -ne 0 ]; then # Failed - echo "ERROR! Failed to find [$LINTER_NAME] in system!" - echo "ERROR:[$VALIDATE_INSTALL_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find [$LINTER_NAME] in system!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]" exit 1 else # Success @@ -187,8 +187,8 @@ function LintCodebase() ######### # Error # ######### - echo "ERROR! Found errors in [$LINTER_NAME] linter!" - echo "ERROR:[$LINT_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]" # Increment the error count (("ERRORS_FOUND_$FILE_TYPE++")) else @@ -240,8 +240,8 @@ function TestCodebase() ############################## if [ $ERROR_CODE -ne 0 ]; then # Failed - echo "ERROR! Failed to find [$LINTER_NAME] in system!" - echo "ERROR:[$VALIDATE_INSTALL_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find [$LINTER_NAME] in system!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]" exit 1 else # Success @@ -358,9 +358,9 @@ function TestCodebase() ######### # Error # ######### - echo "ERROR! Found errors in [$LINTER_NAME] linter!" - echo "ERROR:[$LINT_CMD]" - echo "ERROR: Linter CMD:[$LINTER_COMMAND $FILE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC} Linter CMD:[$LINTER_COMMAND $FILE]" # Increment the error count (("ERRORS_FOUND_$FILE_TYPE++")) # Increment counter that check was ran @@ -384,10 +384,10 @@ function TestCodebase() ######### # Error # ######### - echo "ERROR! Found errors in [$LINTER_NAME] linter!" - echo "ERROR! This file should have failed test case!" - echo "ERROR:[$LINT_CMD]" - echo "ERROR: Linter CMD:[$LINTER_COMMAND $FILE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} This file should have failed test case!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC} Linter CMD:[$LINTER_COMMAND $FILE]" # Increment the error count (("ERRORS_FOUND_$FILE_TYPE++")) # Increment counter that check was ran @@ -410,7 +410,7 @@ function TestCodebase() ################################################# # We failed to find files and no tests were ran # ################################################# - echo "ERROR! Failed to find any tests ran for the Linter:[$LINTER_NAME]"! + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find any tests ran for the Linter:[$LINTER_NAME]"! echo "Please validate logic or that tests exist!" exit 1 fi @@ -513,8 +513,8 @@ function LintAnsibleFiles() ############################## if [ $ERROR_CODE -ne 0 ]; then # Failed - echo "ERROR! Failed to find $LINTER_NAME in system!" - echo "ERROR:[$VALIDATE_INSTALL_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find $LINTER_NAME in system!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]" exit 1 else # Success @@ -619,8 +619,8 @@ function LintAnsibleFiles() ######### # Error # ######### - echo "ERROR! Found errors in [$LINTER_NAME] linter!" - echo "ERROR:[$LINT_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]" # Increment error count ((ERRORS_FOUND_ANSIBLE++)) else From d328495414e7f4eb510b2c505162f44f1de71af6 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 1 Jul 2020 14:28:32 -0500 Subject: [PATCH 2/6] Add more colors for non-errors --- .../ghe-initialize/templates/ghe-config-apply.sh | 2 +- .automation/upload-docker.sh | 4 ++-- lib/buildFileList.sh | 2 +- lib/worker.sh | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh b/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh index 4a25c0ca..e314a03d 100644 --- a/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh +++ b/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh @@ -166,7 +166,7 @@ RunConfigApply() exit 1 else # Success - echo "Successfully ran $GHE_APPLY_COMMAND" + echo -e "${NC}${F[B]}Successfully ran $GHE_APPLY_COMMAND${NC}" fi } ################################################################################ diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh index 03f02a91..83e97d0f 100755 --- a/.automation/upload-docker.sh +++ b/.automation/upload-docker.sh @@ -318,7 +318,7 @@ BuildImage() exit 1 else # SUCCESS - echo "Successfully Built image!" + echo -e "${NC}${F[B]}Successfully Built image!${NC}" fi ######################################################## @@ -342,7 +342,7 @@ BuildImage() exit 1 else # SUCCESS - echo "Successfully tagged image!" + echo -e "${NC}${F[B]}Successfully tagged image!${NC}" fi fi } diff --git a/lib/buildFileList.sh b/lib/buildFileList.sh index d0948419..7618cf37 100755 --- a/lib/buildFileList.sh +++ b/lib/buildFileList.sh @@ -438,5 +438,5 @@ function BuildFileList() ################ echo "" echo "----------------------------------------------" - echo "Successfully gathered list of files..." + echo -e "${NC}${F[B]}Successfully gathered list of files...${NC}" } diff --git a/lib/worker.sh b/lib/worker.sh index b58324a6..1c11cb4d 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -56,7 +56,7 @@ function LintCodebase() else # Success if [[ "$ACTIONS_RUNNER_DEBUG" == "true" ]]; then - echo "Successfully found binary in system" + echo -e "${NC}${F[B]}Successfully found binary in system${NC}" echo "Location:[$VALIDATE_INSTALL_CMD]" fi fi @@ -195,7 +195,7 @@ function LintCodebase() ########### # Success # ########### - echo " - File:[$FILE_NAME] was linted with [$LINTER_NAME] successfully" + echo -e "${NC}${F[B]} - File:${F[W]}[$FILE_NAME]${F[B]} was linted with ${F[W]}[$LINTER_NAME]${F[B]} successfully${NC}" fi done fi @@ -245,7 +245,7 @@ function TestCodebase() exit 1 else # Success - echo "Successfully found binary in system" + echo -e "${NC}${F[B]}Successfully found binary in system${NC}" echo "Location:[$VALIDATE_INSTALL_CMD]" fi @@ -369,7 +369,7 @@ function TestCodebase() ########### # Success # ########### - echo " - File:[$FILE_NAME] was linted with [$LINTER_NAME] successfully" + echo -e "${NC}${F[B]} - File:${F[W]}[$FILE_NAME]${F[B]} was linted with ${F[W]}[$LINTER_NAME]${F[B]} successfully${NC}" # Increment counter that check was ran ((TESTS_RAN++)) fi @@ -396,7 +396,7 @@ function TestCodebase() ########### # Success # ########### - echo " - File:[$FILE_NAME] failed test case with [$LINTER_NAME] successfully" + echo -e "${NC}${F[B]} - File:${F[W]}[$FILE_NAME]${F[B]} failed test case with ${F[W]}[$LINTER_NAME]${F[B]} successfully${NC}" # Increment counter that check was ran ((TESTS_RAN++)) fi @@ -520,7 +520,7 @@ function LintAnsibleFiles() # Success if [[ "$ACTIONS_RUNNER_DEBUG" == "true" ]]; then # Success - echo "Successfully found binary in system" + echo -e "${NC}${F[B]}Successfully found binary in system${NC}" echo "Location:[$VALIDATE_INSTALL_CMD]" fi fi @@ -627,7 +627,7 @@ function LintAnsibleFiles() ########### # Success # ########### - echo " - File:[$FILE_NAME] was linted with [$LINTER_NAME] successfully" + echo -e "${NC}${F[B]} - File:${F[W]}[$FILE_NAME]${F[B]} was linted with ${F[W]}[$LINTER_NAME]${F[B]} successfully${NC}" fi done else # No ansible directory found in path From 504cbc155fd5438bcf0b3a456b2e1475ba6b8633 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 1 Jul 2020 14:33:46 -0500 Subject: [PATCH 3/6] More color --- lib/linter.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linter.sh b/lib/linter.sh index 72a4b451..6c6973ed 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -751,7 +751,7 @@ Footer() [ "$ERRORS_FOUND_CLOJURE" -ne 0 ] || \ [ "$ERRORS_FOUND_KOTLIN" -ne 0 ]; then # Failed exit - echo "Exiting with errors found!" + echo -e "${NC}${F[R]}Exiting with errors found!${NC}" exit 1 else ################# From c872288faa4715f91022110b1548ea1e05aa510a Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 1 Jul 2020 15:40:24 -0500 Subject: [PATCH 4/6] More colors --- .automation/cleanup-docker.sh | 2 +- .automation/upload-docker.sh | 26 +++++++++++++------------- lib/buildFileList.sh | 6 +++--- lib/linter.sh | 16 ++++++++-------- lib/worker.sh | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.automation/cleanup-docker.sh b/.automation/cleanup-docker.sh index f493bd6c..cb9e5dff 100755 --- a/.automation/cleanup-docker.sh +++ b/.automation/cleanup-docker.sh @@ -74,7 +74,7 @@ ValidateInput() echo "Successfully found:[IMAGE_REPO], value:[$IMAGE_REPO]" else # This is a fork and we cant pull vars or any info - echo "WARN! No image to cleanup as this is a forked branch, and not being built with current automation!" + echo -e "${NC}${F[Y]}WARN!${NC} No image to cleanup as this is a forked branch, and not being built with current automation!" exit 0 fi diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh index 83e97d0f..2a65d82f 100755 --- a/.automation/upload-docker.sh +++ b/.automation/upload-docker.sh @@ -64,7 +64,7 @@ ValidateInput() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]" exit 1 else - echo "Successfully found:[GITHUB_WORKSPACE], value:[$GITHUB_WORKSPACE]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_WORKSPACE]${F[B]}, value:${F[W]}[$GITHUB_WORKSPACE]${NC}" fi ##################### @@ -75,7 +75,7 @@ ValidateInput() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$REGISTRY]" exit 1 else - echo "Successfully found:[REGISTRY], value:[$REGISTRY]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[REGISTRY]${F[B]}, value:${F[W]}[$REGISTRY]${NC}" fi ##################################################### @@ -90,7 +90,7 @@ ValidateInput() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GPR_USERNAME]" exit 1 else - echo "Successfully found:[GPR_USERNAME], value:[$GPR_USERNAME]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GPR_USERNAME]${F[B]}, value:${F[W]}[$GPR_USERNAME]${NC}" fi ###################### @@ -101,7 +101,7 @@ ValidateInput() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GPR_TOKEN]" exit 1 else - echo "Successfully found:[GPR_TOKEN], value:[********]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GPR_TOKEN]${F[B]}, value:${F[W]}[********]${NC}" fi ######################################## # See if we need values for Ducker hub # @@ -115,7 +115,7 @@ ValidateInput() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_USERNAME]" exit 1 else - echo "Successfully found:[DOCKER_USERNAME], value:[$DOCKER_USERNAME]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[DOCKER_USERNAME]${F[B]}, value:${F[W]}[$DOCKER_USERNAME]${NC}" fi ############################ @@ -126,7 +126,7 @@ ValidateInput() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_PASSWORD]" exit 1 else - echo "Successfully found:[DOCKER_PASSWORD], value:[********]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[DOCKER_PASSWORD]${F[B]}, value:${F[B]}[********]${NC}" fi ########################################### # We were not passed a registry to update # @@ -146,7 +146,7 @@ ValidateInput() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_REPO]" exit 1 else - echo "Successfully found:[IMAGE_REPO], value:[$IMAGE_REPO]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[IMAGE_REPO]${F[B]}, value:${F[W]}[$IMAGE_REPO]${NC}" ############################################### # Need to see if GPR registry and update name # ############################################### @@ -161,7 +161,7 @@ ValidateInput() # Validate IMAGE_VERSION # ########################## if [ -z "$IMAGE_VERSION" ]; then - echo "WARN! Failed to get [IMAGE_VERSION]!" + echo -e "${NC}${F[Y]}WARN!${NC} Failed to get [IMAGE_VERSION]!" echo "Pulling from Branch Name..." ############################## # Get the name of the branch # @@ -193,7 +193,7 @@ ValidateInput() IMAGE_VERSION="$BRANCH_NAME" echo "Tag:[$IMAGE_VERSION]" else - echo "Successfully found:[IMAGE_VERSION], value:[$IMAGE_VERSION]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[IMAGE_VERSION]${F[B]}, value:${F[W]}[$IMAGE_VERSION]${NC}" fi ################################## @@ -228,7 +228,7 @@ ValidateInput() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKERFILE_PATH]" exit 1 else - echo "Successfully found:[DOCKERFILE_PATH], value:[$DOCKERFILE_PATH]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[DOCKERFILE_PATH]${F[B]}, value:${F[W]}[$DOCKERFILE_PATH]${NC}" fi } ################################################################################ @@ -272,7 +272,7 @@ Authenticate() exit 1 else # SUCCESS - echo "Successfully authenticated to $NAME!" + echo -e "${NC}${F[B]}Successfully authenticated to $NAME!${NC}" fi } ################################################################################ @@ -378,7 +378,7 @@ UploadImage() exit 1 else # SUCCESS - echo "Successfully Uploaded Docker image:[$IMAGE_VERSION] to $REGISTRY!" + echo -e "${NC}${F[B]}Successfully Uploaded Docker image:${F[W]}[$IMAGE_VERSION]${F[B]} to $REGISTRY!${NC}" fi ######################### @@ -444,7 +444,7 @@ UploadImage() exit 1 else # SUCCESS - echo "Successfully Uploaded TAGOR_TAG:[$MAJOR_TAG] Docker image to $REGISTRY!" + echo -e "${NC}${F[B]}Successfully Uploaded TAGOR_TAG:${F[W]}[$MAJOR_TAG]${F[B]} Docker image to $REGISTRY!${NC}" fi fi } diff --git a/lib/buildFileList.sh b/lib/buildFileList.sh index 7618cf37..050b7984 100755 --- a/lib/buildFileList.sh +++ b/lib/buildFileList.sh @@ -374,7 +374,7 @@ function BuildFileList() ####################### # It is a bash script # ####################### - echo "WARN! Found bash script without extension:[.sh]" + echo -e "${NC}${F[Y]}WARN!${NC} Found bash script without extension:[.sh]" echo "Please update file with proper extensions." ################################ # Append the file to the array # @@ -388,7 +388,7 @@ function BuildFileList() ####################### # It is a Ruby script # ####################### - echo "WARN! Found ruby script without extension:[.rb]" + echo -e "${NC}${F[Y]}WARN!${NC} Found ruby script without extension:[.rb]" echo "Please update file with proper extensions." ################################ # Append the file to the array # @@ -402,7 +402,7 @@ function BuildFileList() ############################ # Extension was not found! # ############################ - echo " - WARN! Failed to get filetype for:[$FILE]!" + echo -e "${NC}${F[Y]} - WARN!${NC} Failed to get filetype for:[$FILE]!" ########################################################## # Set the READ_ONLY_CHANGE_FLAG since this could be exec # ########################################################## diff --git a/lib/linter.sh b/lib/linter.sh index 6c6973ed..9656da92 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -279,7 +279,7 @@ GetLinterVersions() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ] || [ -z "${GET_VERSION_CMD[*]}" ]; then - echo "WARN! Failed to get version info for:[$LINTER]" + echo -e "${NC}${F[Y]}WARN!${NC} Failed to get version info for:[$LINTER]" echo "---------------------------------------------" else ########################## @@ -580,7 +580,7 @@ GetGitHubVars() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_SHA]" exit 1 else - echo "Successfully found:[GITHUB_SHA], value:[$GITHUB_SHA]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_SHA]${F[B]}, value:${F[W]}[$GITHUB_SHA]${NC}" fi ############################ @@ -591,7 +591,7 @@ GetGitHubVars() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]" exit 1 else - echo "Successfully found:[GITHUB_WORKSPACE], value:[$GITHUB_WORKSPACE]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_WORKSPACE]${F[B]}, value:${F[W]}[$GITHUB_WORKSPACE]${NC}" fi ############################ @@ -602,7 +602,7 @@ GetGitHubVars() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_EVENT_PATH]" exit 1 else - echo "Successfully found:[GITHUB_EVENT_PATH], value:[$GITHUB_EVENT_PATH]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_EVENT_PATH]${F[B]}, value:${F[W]}[$GITHUB_EVENT_PATH]${F[B]}" fi ################################################## @@ -622,7 +622,7 @@ GetGitHubVars() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_ORG]" exit 1 else - echo "Successfully found:[GITHUB_ORG], value:[$GITHUB_ORG]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_ORG]${F[B]}, value:${F[W]}[$GITHUB_ORG]${NC}" fi ####################### @@ -638,7 +638,7 @@ GetGitHubVars() echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_REPO]" exit 1 else - echo "Successfully found:[GITHUB_REPO], value:[$GITHUB_REPO]" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_REPO]${F[B]}, value:${F[W]}[$GITHUB_REPO]${NC}" fi fi } @@ -679,8 +679,8 @@ function ValidatePowershellModules() else # Success if [[ "$ACTIONS_RUNNER_DEBUG" == "true" ]]; then - echo "Successfully found module [$VALIDATE_PSSA_MODULE] in system" - echo "Successfully found command [$VALIDATE_PSSA_CMD] in system" + echo -e "${NC}${F[B]}Successfully found module ${F[W]}[$VALIDATE_PSSA_MODULE]${F[B]} in system${NC}" + echo -e "${NC}${F[B]}Successfully found command ${F[W]}[$VALIDATE_PSSA_CMD]${F[B]} in system${NC}" fi fi } diff --git a/lib/worker.sh b/lib/worker.sh index 03db8460..dd36d438 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -638,7 +638,7 @@ function LintAnsibleFiles() ######################## # No Ansible dir found # ######################## - echo "WARN! No Ansible base directory found at:[$ANSIBLE_DIRECTORY]" + echo -e "${NC}${F[Y]}WARN!${NC} No Ansible base directory found at:[$ANSIBLE_DIRECTORY]" echo "skipping ansible lint" fi fi From ff21bbf79cd53661c397abcef53e8c757158847a Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 1 Jul 2020 15:47:24 -0500 Subject: [PATCH 5/6] Always end with NC --- .automation/cleanup-docker.sh | 34 +++++------ .../templates/ghe-config-apply.sh | 12 ++-- .automation/upload-docker.sh | 60 +++++++++---------- lib/buildFileList.sh | 14 ++--- lib/linter.sh | 40 ++++++------- lib/worker.sh | 38 ++++++------ 6 files changed, 99 insertions(+), 99 deletions(-) diff --git a/.automation/cleanup-docker.sh b/.automation/cleanup-docker.sh index cb9e5dff..8f03a2df 100755 --- a/.automation/cleanup-docker.sh +++ b/.automation/cleanup-docker.sh @@ -54,8 +54,8 @@ ValidateInput() # Validate GITHUB_WORKSPACE # ############################ if [ -z "$GITHUB_WORKSPACE" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]${NC}" exit 1 else echo "Successfully found:[GITHUB_WORKSPACE], value:[$GITHUB_WORKSPACE]" @@ -66,15 +66,15 @@ ValidateInput() ####################### if [ -z "$IMAGE_REPO" ]; then # No repo was pulled - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_REPO]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_REPO]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_REPO]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_REPO]${NC}" exit 1 elif [[ "$IMAGE_REPO" == "github/super-linter" ]]; then # Found our main repo echo "Successfully found:[IMAGE_REPO], value:[$IMAGE_REPO]" else # This is a fork and we cant pull vars or any info - echo -e "${NC}${F[Y]}WARN!${NC} No image to cleanup as this is a forked branch, and not being built with current automation!" + echo -e "${NC}${F[Y]}WARN!${NC} No image to cleanup as this is a forked branch, and not being built with current automation!${NC}" exit 0 fi @@ -82,8 +82,8 @@ ValidateInput() # Validate IMAGE_VERSION # ########################## if [ -z "$IMAGE_VERSION" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_VERSION]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_VERSION]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_VERSION]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_VERSION]${NC}" exit 1 else echo "Successfully found:[IMAGE_VERSION], value:[$IMAGE_VERSION]" @@ -93,8 +93,8 @@ ValidateInput() # Validate DOCKER_USERNAME # ############################ if [ -z "$DOCKER_USERNAME" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_USERNAME]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_USERNAME]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_USERNAME]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_USERNAME]${NC}" exit 1 else echo "Successfully found:[DOCKER_USERNAME], value:[$DOCKER_USERNAME]" @@ -104,8 +104,8 @@ ValidateInput() # Validate DOCKER_PASSWORD # ############################ if [ -z "$DOCKER_PASSWORD" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_PASSWORD]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_PASSWORD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_PASSWORD]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_PASSWORD]${NC}" exit 1 else echo "Successfully found:[DOCKER_PASSWORD], value:[********]" @@ -157,8 +157,8 @@ LoginToDocker() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to authenticate to DockerHub!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LOGIN_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to authenticate to DockerHub!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LOGIN_CMD]${NC}" exit 1 else # SUCCESS @@ -197,8 +197,8 @@ RemoveImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain token from DockerHub!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$TOKEN]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain token from DockerHub!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$TOKEN]${NC}" exit 1 else # SUCCESS @@ -222,8 +222,8 @@ RemoveImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to remove tag from DockerHub!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$REMOVE_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to remove tag from DockerHub!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$REMOVE_CMD]${NC}" exit 1 else # SUCCESS diff --git a/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh b/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh index e314a03d..0c910082 100644 --- a/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh +++ b/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh @@ -53,8 +53,8 @@ CheckGHEPid() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to sleep!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SLEEP_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to sleep!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SLEEP_CMD]${NC}" echo "Will try to call apply as last effort..." #################################### # Call config apply as last effort # @@ -117,8 +117,8 @@ CheckGHEProcess() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to sleep!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SLEEP_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to sleep!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SLEEP_CMD]${NC}" echo "Will try to call apply as last effort..." #################################### # Call config apply as last effort # @@ -161,8 +161,8 @@ RunConfigApply() ############################## if [ $ERROR_CODE -ne 0 ]; then # Errors - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to run config apply command!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$APPLY_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to run config apply command!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$APPLY_CMD]${NC}" exit 1 else # Success diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh index 2a65d82f..805d30ce 100755 --- a/.automation/upload-docker.sh +++ b/.automation/upload-docker.sh @@ -60,8 +60,8 @@ ValidateInput() # Validate GITHUB_WORKSPACE # ############################# if [ -z "$GITHUB_WORKSPACE" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_WORKSPACE]${F[B]}, value:${F[W]}[$GITHUB_WORKSPACE]${NC}" @@ -71,8 +71,8 @@ ValidateInput() # Validate REGISTRY # ##################### if [ -z "$REGISTRY" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [REGISTRY]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$REGISTRY]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [REGISTRY]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$REGISTRY]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[REGISTRY]${F[B]}, value:${F[W]}[$REGISTRY]${NC}" @@ -86,8 +86,8 @@ ValidateInput() # Validate GPR_USERNAME # ######################### if [ -z "$GPR_USERNAME" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GPR_USERNAME]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GPR_USERNAME]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GPR_USERNAME]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GPR_USERNAME]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[GPR_USERNAME]${F[B]}, value:${F[W]}[$GPR_USERNAME]${NC}" @@ -97,8 +97,8 @@ ValidateInput() # Validate GPR_TOKEN # ###################### if [ -z "$GPR_TOKEN" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GPR_TOKEN]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GPR_TOKEN]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GPR_TOKEN]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GPR_TOKEN]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[GPR_TOKEN]${F[B]}, value:${F[W]}[********]${NC}" @@ -111,8 +111,8 @@ ValidateInput() # Validate DOCKER_USERNAME # ############################ if [ -z "$DOCKER_USERNAME" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_USERNAME]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_USERNAME]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_USERNAME]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_USERNAME]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[DOCKER_USERNAME]${F[B]}, value:${F[W]}[$DOCKER_USERNAME]${NC}" @@ -122,8 +122,8 @@ ValidateInput() # Validate DOCKER_PASSWORD # ############################ if [ -z "$DOCKER_PASSWORD" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_PASSWORD]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_PASSWORD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKER_PASSWORD]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKER_PASSWORD]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[DOCKER_PASSWORD]${F[B]}, value:${F[B]}[********]${NC}" @@ -132,7 +132,7 @@ ValidateInput() # We were not passed a registry to update # ########################################### else - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find a valid registry!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find a valid registry!${NC}" echo "Registry:[$REGISTRY]" exit 1 fi @@ -142,8 +142,8 @@ ValidateInput() # Validate IMAGE_REPO # ####################### if [ -z "$IMAGE_REPO" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_REPO]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_REPO]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [IMAGE_REPO]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$IMAGE_REPO]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[IMAGE_REPO]${F[B]}, value:${F[W]}[$IMAGE_REPO]${NC}" @@ -161,7 +161,7 @@ ValidateInput() # Validate IMAGE_VERSION # ########################## if [ -z "$IMAGE_VERSION" ]; then - echo -e "${NC}${F[Y]}WARN!${NC} Failed to get [IMAGE_VERSION]!" + echo -e "${NC}${F[Y]}WARN!${NC} Failed to get [IMAGE_VERSION]!${NC}" echo "Pulling from Branch Name..." ############################## # Get the name of the branch # @@ -177,8 +177,8 @@ ValidateInput() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get branch name!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$BRANCH_NAME]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get branch name!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$BRANCH_NAME]${NC}" exit 1 fi @@ -224,8 +224,8 @@ ValidateInput() # Validate DOCKERFILE_PATH # ############################ if [ -z "$DOCKERFILE_PATH" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKERFILE_PATH]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKERFILE_PATH]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [DOCKERFILE_PATH]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$DOCKERFILE_PATH]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[DOCKERFILE_PATH]${F[B]}, value:${F[W]}[$DOCKERFILE_PATH]${NC}" @@ -267,8 +267,8 @@ Authenticate() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to authenticate to $NAME!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LOGIN_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to authenticate to $NAME!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LOGIN_CMD]${NC}" exit 1 else # SUCCESS @@ -293,7 +293,7 @@ BuildImage() ################################ if [ ! -f "$DOCKERFILE_PATH" ]; then # No file found - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to find Dockerfile at:[$DOCKERFILE_PATH]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to find Dockerfile at:[$DOCKERFILE_PATH]${NC}" echo "Please make sure you give full path!" echo "Example:[/configs/Dockerfile] or [Dockerfile] if at root directory" exit 1 @@ -314,7 +314,7 @@ BuildImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [build] Dockerfile!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [build] Dockerfile!${NC}" exit 1 else # SUCCESS @@ -338,7 +338,7 @@ BuildImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [tag] Dockerfile!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [tag] Dockerfile!${NC}" exit 1 else # SUCCESS @@ -374,7 +374,7 @@ UploadImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [upload] Dockerfile!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [upload] Dockerfile!${NC}" exit 1 else # SUCCESS @@ -397,8 +397,8 @@ UploadImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get information about built Image!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GET_INFO_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get information about built Image!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GET_INFO_CMD]${NC}" exit 1 else ################ @@ -440,7 +440,7 @@ UploadImage() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [upload] MAJOR_TAG:[$MAJOR_TAG] Dockerfile!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} failed to [upload] MAJOR_TAG:[$MAJOR_TAG] Dockerfile!${NC}" exit 1 else # SUCCESS @@ -495,7 +495,7 @@ else ######### # ERROR # ######### - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Registry not set correctly!" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Registry not set correctly!${NC}" echo "Registry:[$REGISTRY]" exit 1 fi diff --git a/lib/buildFileList.sh b/lib/buildFileList.sh index 050b7984..1366ef71 100755 --- a/lib/buildFileList.sh +++ b/lib/buildFileList.sh @@ -39,7 +39,7 @@ function BuildFileList() if [ $ERROR_CODE -ne 0 ]; then # Error echo "Failed to switch to $DEFAULT_BRANCH branch to get files changed!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SWITCH_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SWITCH_CMD]${NC}" exit 1 fi @@ -67,8 +67,8 @@ function BuildFileList() ############################## if [ $ERROR_CODE -ne 0 ]; then # Error - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain a list of all files changed!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[${RAW_FILE_ARRAY[*]}]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain a list of all files changed!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[${RAW_FILE_ARRAY[*]}]${NC}" exit 1 fi @@ -374,7 +374,7 @@ function BuildFileList() ####################### # It is a bash script # ####################### - echo -e "${NC}${F[Y]}WARN!${NC} Found bash script without extension:[.sh]" + echo -e "${NC}${F[Y]}WARN!${NC} Found bash script without extension:[.sh]${NC}" echo "Please update file with proper extensions." ################################ # Append the file to the array # @@ -388,7 +388,7 @@ function BuildFileList() ####################### # It is a Ruby script # ####################### - echo -e "${NC}${F[Y]}WARN!${NC} Found ruby script without extension:[.rb]" + echo -e "${NC}${F[Y]}WARN!${NC} Found ruby script without extension:[.rb]${NC}" echo "Please update file with proper extensions." ################################ # Append the file to the array # @@ -402,7 +402,7 @@ function BuildFileList() ############################ # Extension was not found! # ############################ - echo -e "${NC}${F[Y]} - WARN!${NC} Failed to get filetype for:[$FILE]!" + echo -e "${NC}${F[Y]} - WARN!${NC} Failed to get filetype for:[$FILE]!${NC}" ########################################################## # Set the READ_ONLY_CHANGE_FLAG since this could be exec # ########################################################## @@ -429,7 +429,7 @@ function BuildFileList() if [ $ERROR_CODE -ne 0 ]; then # Error echo "Failed to switch back to branch!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SWITCH2_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$SWITCH2_CMD]${NC}" exit 1 fi diff --git a/lib/linter.sh b/lib/linter.sh index 9656da92..8a722950 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -279,7 +279,7 @@ GetLinterVersions() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ] || [ -z "${GET_VERSION_CMD[*]}" ]; then - echo -e "${NC}${F[Y]}WARN!${NC} Failed to get version info for:[$LINTER]" + echo -e "${NC}${F[Y]}WARN!${NC} Failed to get version info for:[$LINTER]${NC}" echo "---------------------------------------------" else ########################## @@ -323,8 +323,8 @@ GetLinterRules() # Check the shell for errors # ############################## if [ $ERROR_CODE -ne 0 ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to set file:[$FILE_NAME] as default!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$CP_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to set file:[$FILE_NAME] as default!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$CP_CMD]${NC}" exit 1 fi else @@ -374,8 +374,8 @@ GetStandardRules() ############################## if [ $ERROR_CODE -ne 0 ]; then # ERROR - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain list of ENV vars to load!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[${GET_ENV_ARRAY[*]}]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to gain list of ENV vars to load!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[${GET_ENV_ARRAY[*]}]${NC}" exit 1 fi @@ -576,8 +576,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_SHA" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_SHA]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_SHA]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_SHA]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_SHA]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_SHA]${F[B]}, value:${F[W]}[$GITHUB_SHA]${NC}" @@ -587,8 +587,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_WORKSPACE" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_WORKSPACE]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_WORKSPACE]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_WORKSPACE]${F[B]}, value:${F[W]}[$GITHUB_WORKSPACE]${NC}" @@ -598,11 +598,11 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_EVENT_PATH" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_EVENT_PATH]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_EVENT_PATH]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_EVENT_PATH]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_EVENT_PATH]${NC}" exit 1 else - echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_EVENT_PATH]${F[B]}, value:${F[W]}[$GITHUB_EVENT_PATH]${F[B]}" + echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_EVENT_PATH]${F[B]}, value:${F[W]}[$GITHUB_EVENT_PATH]${F[B]}${NC}" fi ################################################## @@ -618,8 +618,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_ORG" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_ORG]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_ORG]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_ORG]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_ORG]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_ORG]${F[B]}, value:${F[W]}[$GITHUB_ORG]${NC}" @@ -634,8 +634,8 @@ GetGitHubVars() # Validate we have a value # ############################ if [ -z "$GITHUB_REPO" ]; then - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_REPO]!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_REPO]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to get [GITHUB_REPO]!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$GITHUB_REPO]${NC}" exit 1 else echo -e "${NC}${F[B]}Successfully found:${F[W]}[GITHUB_REPO]${F[B]}, value:${F[W]}[$GITHUB_REPO]${NC}" @@ -673,8 +673,8 @@ function ValidatePowershellModules() ############################## if [ $ERROR_CODE -ne 0 ]; then # Failed - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed find module [PSScriptAnalyzer] for [$LINTER_NAME] in system!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[PSSA_MODULE $VALIDATE_PSSA_MODULE] [PSSA_CMD $VALIDATE_PSSA_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed find module [PSScriptAnalyzer] for [$LINTER_NAME] in system!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[PSSA_MODULE $VALIDATE_PSSA_MODULE] [PSSA_CMD $VALIDATE_PSSA_CMD]${NC}" exit 1 else # Success @@ -711,7 +711,7 @@ Footer() ################## if [ "${!ERROR_COUNTER}" -ne 0 ]; then # Print the goods - echo -e "${NC}${B[R]}${F[W]}ERRORS FOUND${NC} in $LANGUAGE:[${!ERROR_COUNTER}]" + echo -e "${NC}${B[R]}${F[W]}ERRORS FOUND${NC} in $LANGUAGE:[${!ERROR_COUNTER}]${NC}" fi done @@ -719,7 +719,7 @@ Footer() # Exit with 0 if errors disabled # ################################## if [ "$DISABLE_ERRORS" == "true" ]; then - echo -e "${NC}${F[Y]}WARN!${NC} Exiting with exit code:[0] as:[DISABLE_ERRORS] was set to:[$DISABLE_ERRORS]" + echo -e "${NC}${F[Y]}WARN!${NC} Exiting with exit code:[0] as:[DISABLE_ERRORS] was set to:[$DISABLE_ERRORS]${NC}" exit 0 ############################### # Exit with 1 if errors found # diff --git a/lib/worker.sh b/lib/worker.sh index dd36d438..80251f32 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -50,8 +50,8 @@ function LintCodebase() ############################## if [ $ERROR_CODE -ne 0 ]; then # Failed - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find [$LINTER_NAME] in system!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find [$LINTER_NAME] in system!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]${NC}" exit 1 else # Success @@ -187,8 +187,8 @@ function LintCodebase() ######### # Error # ######### - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]${NC}" # Increment the error count (("ERRORS_FOUND_$FILE_TYPE++")) else @@ -240,8 +240,8 @@ function TestCodebase() ############################## if [ $ERROR_CODE -ne 0 ]; then # Failed - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find [$LINTER_NAME] in system!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find [$LINTER_NAME] in system!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]${NC}" exit 1 else # Success @@ -358,9 +358,9 @@ function TestCodebase() ######### # Error # ######### - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC} Linter CMD:[$LINTER_COMMAND $FILE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC} Linter CMD:[$LINTER_COMMAND $FILE]${NC}" # Increment the error count (("ERRORS_FOUND_$FILE_TYPE++")) # Increment counter that check was ran @@ -384,10 +384,10 @@ function TestCodebase() ######### # Error # ######### - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!" - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} This file should have failed test case!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC} Linter CMD:[$LINTER_COMMAND $FILE]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} This file should have failed test case!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC} Linter CMD:[$LINTER_COMMAND $FILE]${NC}" # Increment the error count (("ERRORS_FOUND_$FILE_TYPE++")) # Increment counter that check was ran @@ -410,7 +410,7 @@ function TestCodebase() ################################################# # We failed to find files and no tests were ran # ################################################# - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find any tests ran for the Linter:[$LINTER_NAME]"! + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find any tests ran for the Linter:[$LINTER_NAME]${NC}"! echo "Please validate logic or that tests exist!" exit 1 fi @@ -513,8 +513,8 @@ function LintAnsibleFiles() ############################## if [ $ERROR_CODE -ne 0 ]; then # Failed - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find $LINTER_NAME in system!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Failed to find $LINTER_NAME in system!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$VALIDATE_INSTALL_CMD]${NC}" exit 1 else # Success @@ -619,8 +619,8 @@ function LintAnsibleFiles() ######### # Error # ######### - echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!" - echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]" + echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [$LINTER_NAME] linter!${NC}" + echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[$LINT_CMD]${NC}" # Increment error count ((ERRORS_FOUND_ANSIBLE++)) else @@ -638,7 +638,7 @@ function LintAnsibleFiles() ######################## # No Ansible dir found # ######################## - echo -e "${NC}${F[Y]}WARN!${NC} No Ansible base directory found at:[$ANSIBLE_DIRECTORY]" + echo -e "${NC}${F[Y]}WARN!${NC} No Ansible base directory found at:[$ANSIBLE_DIRECTORY]${NC}" echo "skipping ansible lint" fi fi From 5c11c6bed2d8a9f3b0fcf976ec11761fd6102de1 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 1 Jul 2020 15:56:04 -0500 Subject: [PATCH 6/6] More colors --- .../ansible/ghe-initialize/templates/ghe-config-apply.sh | 2 +- .automation/upload-docker.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh b/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh index 0c910082..0fe1e1e0 100644 --- a/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh +++ b/.automation/test/ansible/ghe-initialize/templates/ghe-config-apply.sh @@ -166,7 +166,7 @@ RunConfigApply() exit 1 else # Success - echo -e "${NC}${F[B]}Successfully ran $GHE_APPLY_COMMAND${NC}" + echo -e "${NC}${F[B]}Successfully ran ${F[C]}$GHE_APPLY_COMMAND${NC}" fi } ################################################################################ diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh index 805d30ce..f57ec068 100755 --- a/.automation/upload-docker.sh +++ b/.automation/upload-docker.sh @@ -272,7 +272,7 @@ Authenticate() exit 1 else # SUCCESS - echo -e "${NC}${F[B]}Successfully authenticated to $NAME!${NC}" + echo -e "${NC}${F[B]}Successfully authenticated to ${F[C]}$NAME${F[B]}!${NC}" fi } ################################################################################ @@ -378,7 +378,7 @@ UploadImage() exit 1 else # SUCCESS - echo -e "${NC}${F[B]}Successfully Uploaded Docker image:${F[W]}[$IMAGE_VERSION]${F[B]} to $REGISTRY!${NC}" + echo -e "${NC}${F[B]}Successfully Uploaded Docker image:${F[W]}[$IMAGE_VERSION]${F[B]} to ${F[C]}$REGISTRY${F[B]}!${NC}" fi ######################### @@ -444,7 +444,7 @@ UploadImage() exit 1 else # SUCCESS - echo -e "${NC}${F[B]}Successfully Uploaded TAGOR_TAG:${F[W]}[$MAJOR_TAG]${F[B]} Docker image to $REGISTRY!${NC}" + echo -e "${NC}${F[B]}Successfully Uploaded TAGOR_TAG:${F[W]}[$MAJOR_TAG]${F[B]} Docker image to ${F[C]}$REGISTRY${F[B]}!${NC}" fi fi }