From 008a3057c9c68c5d2305840f25d5cac5bdd42377 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 27 Jul 2020 16:35:53 -0500 Subject: [PATCH] Remove trailing NC on log functions --- .automation/cleanup-docker.sh | 32 +++++----- .../templates/ghe-config-apply.sh | 12 ++-- .automation/upload-docker.sh | 58 +++++++++---------- lib/buildFileList.sh | 8 +-- lib/linter.sh | 48 +++++++-------- lib/worker.sh | 38 ++++++------ 6 files changed, 98 insertions(+), 98 deletions(-) diff --git a/.automation/cleanup-docker.sh b/.automation/cleanup-docker.sh index 7910f17b..028a8aa6 100755 --- a/.automation/cleanup-docker.sh +++ b/.automation/cleanup-docker.sh @@ -52,8 +52,8 @@ ValidateInput() { # Validate GITHUB_WORKSPACE # ############################ if [ -z "${GITHUB_WORKSPACE}" ]; then - error "Failed to get [GITHUB_WORKSPACE]!${NC}" - fatal "[${GITHUB_WORKSPACE}]${NC}" + error "Failed to get [GITHUB_WORKSPACE]!" + fatal "[${GITHUB_WORKSPACE}]" else echo "Successfully found:[GITHUB_WORKSPACE], value:[${GITHUB_WORKSPACE}]" fi @@ -63,8 +63,8 @@ ValidateInput() { ####################### if [ -z "${IMAGE_REPO}" ]; then # No repo was pulled - error "Failed to get [IMAGE_REPO]!${NC}" - fatal "[${IMAGE_REPO}]${NC}" + error "Failed to get [IMAGE_REPO]!" + fatal "[${IMAGE_REPO}]" elif [[ ${IMAGE_REPO} == "github/super-linter" ]]; then # Found our main repo echo "Successfully found:[IMAGE_REPO], value:[${IMAGE_REPO}]" @@ -78,8 +78,8 @@ ValidateInput() { # Validate IMAGE_VERSION # ########################## if [ -z "${IMAGE_VERSION}" ]; then - error "Failed to get [IMAGE_VERSION]!${NC}" - fatal "[${IMAGE_VERSION}]${NC}" + error "Failed to get [IMAGE_VERSION]!" + fatal "[${IMAGE_VERSION}]" else echo "Successfully found:[IMAGE_VERSION], value:[${IMAGE_VERSION}]" fi @@ -88,8 +88,8 @@ ValidateInput() { # Validate DOCKER_USERNAME # ############################ if [ -z "${DOCKER_USERNAME}" ]; then - error "Failed to get [DOCKER_USERNAME]!${NC}" - fatal "[${DOCKER_USERNAME}]${NC}" + error "Failed to get [DOCKER_USERNAME]!" + fatal "[${DOCKER_USERNAME}]" else echo "Successfully found:[DOCKER_USERNAME], value:[${DOCKER_USERNAME}]" fi @@ -98,8 +98,8 @@ ValidateInput() { # Validate DOCKER_PASSWORD # ############################ if [ -z "${DOCKER_PASSWORD}" ]; then - error "Failed to get [DOCKER_PASSWORD]!${NC}" - fatal "[${DOCKER_PASSWORD}]${NC}" + error "Failed to get [DOCKER_PASSWORD]!" + fatal "[${DOCKER_PASSWORD}]" else echo "Successfully found:[DOCKER_PASSWORD], value:[********]" fi @@ -148,8 +148,8 @@ LoginToDocker() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - error "Failed to authenticate to DockerHub!${NC}" - fatal "[${LOGIN_CMD}]${NC}" + error "Failed to authenticate to DockerHub!" + fatal "[${LOGIN_CMD}]" else # SUCCESS echo "Successfully authenticated to DockerHub!" @@ -186,8 +186,8 @@ RemoveImage() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - error "Failed to gain token from DockerHub!${NC}" - fatal "[${TOKEN}]${NC}" + error "Failed to gain token from DockerHub!" + fatal "[${TOKEN}]" else # SUCCESS echo "Successfully gained auth token from DockerHub!" @@ -210,8 +210,8 @@ RemoveImage() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - error "Failed to remove tag from DockerHub!${NC}" - fatal "[${REMOVE_CMD}]${NC}" + error "Failed to remove tag from DockerHub!" + fatal "[${REMOVE_CMD}]" else # SUCCESS echo "Successfully [removed] Docker image tag:[${IMAGE_VERSION}] from DockerHub!" 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 227caabc..9258978b 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 - error "Failed to sleep!${NC}" - error "[${SLEEP_CMD}]${NC}" + error "Failed to sleep!" + error "[${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 - error "Failed to sleep!${NC}" - error "[${SLEEP_CMD}]${NC}" + error "Failed to sleep!" + error "[${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 - error "Failed to run config apply command!${NC}" - fatal "[${APPLY_CMD}]${NC}" + error "Failed to run config apply command!" + fatal "[${APPLY_CMD}]" else # Success notice "Successfully ran ${F[C]}${GHE_APPLY_COMMAND}${NC}" diff --git a/.automation/upload-docker.sh b/.automation/upload-docker.sh index d4fccdf8..bbb1bae7 100755 --- a/.automation/upload-docker.sh +++ b/.automation/upload-docker.sh @@ -58,8 +58,8 @@ ValidateInput() { # Validate GITHUB_WORKSPACE # ############################# if [ -z "${GITHUB_WORKSPACE}" ]; then - error "Failed to get [GITHUB_WORKSPACE]!${NC}" - fatal "[${GITHUB_WORKSPACE}]${NC}" + error "Failed to get [GITHUB_WORKSPACE]!" + fatal "[${GITHUB_WORKSPACE}]" else notice "Successfully found:${F[W]}[GITHUB_WORKSPACE]${F[B]}, value:${F[W]}[${GITHUB_WORKSPACE}]${NC}" fi @@ -68,8 +68,8 @@ ValidateInput() { # Validate REGISTRY # ##################### if [ -z "${REGISTRY}" ]; then - error "Failed to get [REGISTRY]!${NC}" - fatal "[${REGISTRY}]${NC}" + error "Failed to get [REGISTRY]!" + fatal "[${REGISTRY}]" else notice "Successfully found:${F[W]}[REGISTRY]${F[B]}, value:${F[W]}[${REGISTRY}]${NC}" fi @@ -82,8 +82,8 @@ ValidateInput() { # Validate GPR_USERNAME # ######################### if [ -z "${GPR_USERNAME}" ]; then - error "Failed to get [GPR_USERNAME]!${NC}" - fatal "[${GPR_USERNAME}]${NC}" + error "Failed to get [GPR_USERNAME]!" + fatal "[${GPR_USERNAME}]" else notice "Successfully found:${F[W]}[GPR_USERNAME]${F[B]}, value:${F[W]}[${GPR_USERNAME}]${NC}" fi @@ -92,8 +92,8 @@ ValidateInput() { # Validate GPR_TOKEN # ###################### if [ -z "${GPR_TOKEN}" ]; then - error "Failed to get [GPR_TOKEN]!${NC}" - fatal "[${GPR_TOKEN}]${NC}" + error "Failed to get [GPR_TOKEN]!" + fatal "[${GPR_TOKEN}]" else notice "Successfully found:${F[W]}[GPR_TOKEN]${F[B]}, value:${F[W]}[********]${NC}" fi @@ -105,8 +105,8 @@ ValidateInput() { # Validate DOCKER_USERNAME # ############################ if [ -z "${DOCKER_USERNAME}" ]; then - error "Failed to get [DOCKER_USERNAME]!${NC}" - fatal "[${DOCKER_USERNAME}]${NC}" + error "Failed to get [DOCKER_USERNAME]!" + fatal "[${DOCKER_USERNAME}]" else notice "Successfully found:${F[W]}[DOCKER_USERNAME]${F[B]}, value:${F[W]}[${DOCKER_USERNAME}]${NC}" fi @@ -115,8 +115,8 @@ ValidateInput() { # Validate DOCKER_PASSWORD # ############################ if [ -z "${DOCKER_PASSWORD}" ]; then - error "Failed to get [DOCKER_PASSWORD]!${NC}" - fatal "[${DOCKER_PASSWORD}]${NC}" + error "Failed to get [DOCKER_PASSWORD]!" + fatal "[${DOCKER_PASSWORD}]" else notice "Successfully found:${F[W]}[DOCKER_PASSWORD]${F[B]}, value:${F[B]}[********]${NC}" fi @@ -124,7 +124,7 @@ ValidateInput() { # We were not passed a registry to update # ########################################### else - error "Failed to find a valid registry!${NC}" + error "Failed to find a valid registry!" fatal "Registry:[${REGISTRY}]" fi @@ -132,8 +132,8 @@ ValidateInput() { # Validate IMAGE_REPO # ####################### if [ -z "${IMAGE_REPO}" ]; then - error "Failed to get [IMAGE_REPO]!${NC}" - fatal "[${IMAGE_REPO}]${NC}" + error "Failed to get [IMAGE_REPO]!" + fatal "[${IMAGE_REPO}]" else notice "Successfully found:${F[W]}[IMAGE_REPO]${F[B]}, value:${F[W]}[${IMAGE_REPO}]${NC}" ############################################### @@ -166,8 +166,8 @@ ValidateInput() { # Check the shell for errors # ############################## if [ ${ERROR_CODE} -ne 0 ]; then - error "Failed to get branch name!${NC}" - fatal "[${BRANCH_NAME}]${NC}" + error "Failed to get branch name!" + fatal "[${BRANCH_NAME}]" fi ################################## @@ -212,8 +212,8 @@ ValidateInput() { # Validate DOCKERFILE_PATH # ############################ if [ -z "${DOCKERFILE_PATH}" ]; then - error "Failed to get [DOCKERFILE_PATH]!${NC}" - fatal "[${DOCKERFILE_PATH}]${NC}" + error "Failed to get [DOCKERFILE_PATH]!" + fatal "[${DOCKERFILE_PATH}]" else notice "Successfully found:${F[W]}[DOCKERFILE_PATH]${F[B]}, value:${F[W]}[${DOCKERFILE_PATH}]${NC}" fi @@ -253,8 +253,8 @@ Authenticate() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - error "Failed to authenticate to ${NAME}!${NC}" - fatal "[${LOGIN_CMD}]${NC}" + error "Failed to authenticate to ${NAME}!" + fatal "[${LOGIN_CMD}]" fatal else # SUCCESS notice "Successfully authenticated to ${F[C]}${NAME}${F[B]}!${NC}" @@ -277,7 +277,7 @@ BuildImage() { ################################ if [ ! -f "${DOCKERFILE_PATH}" ]; then # No file found - error "failed to find Dockerfile at:[${DOCKERFILE_PATH}]${NC}" + error "failed to find Dockerfile at:[${DOCKERFILE_PATH}]" error "Please make sure you give full path!" fatal "Example:[/configs/Dockerfile] or [Dockerfile] if at root directory" fi @@ -297,7 +297,7 @@ BuildImage() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - fatal "failed to [build] Dockerfile!${NC}" + fatal "failed to [build] Dockerfile!" else # SUCCESS notice "Successfully Built image!${NC}" @@ -320,7 +320,7 @@ BuildImage() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - fatal "failed to [tag] Dockerfile!${NC}" + fatal "failed to [tag] Dockerfile!" else # SUCCESS notice "Successfully tagged image!${NC}" @@ -354,7 +354,7 @@ UploadImage() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - fatal "failed to [upload] Dockerfile!${NC}" + fatal "failed to [upload] Dockerfile!" else # SUCCESS notice "Successfully Uploaded Docker image:${F[W]}[${IMAGE_VERSION}]${F[B]} to ${F[C]}${REGISTRY}${F[B]}!${NC}" @@ -376,8 +376,8 @@ UploadImage() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - error "Failed to get information about built Image!${NC}" - fatal "[${GET_INFO_CMD}]${NC}" + error "Failed to get information about built Image!" + fatal "[${GET_INFO_CMD}]" else ################ # Get the data # @@ -418,7 +418,7 @@ UploadImage() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - fatal "failed to [upload] MAJOR_TAG:[${MAJOR_TAG}] Dockerfile!${NC}" + fatal "failed to [upload] MAJOR_TAG:[${MAJOR_TAG}] Dockerfile!" else # SUCCESS notice "Successfully Uploaded TAG:${F[W]}[${MAJOR_TAG}]${F[B]} of Docker image to ${F[C]}${REGISTRY}${F[B]}!${NC}" @@ -471,7 +471,7 @@ else ######### # ERROR # ######### - error "Registry not set correctly!${NC}" + error "Registry not set correctly!" fatal "Registry:[${REGISTRY}]" fi diff --git a/lib/buildFileList.sh b/lib/buildFileList.sh index 75d18b4c..71851b2e 100755 --- a/lib/buildFileList.sh +++ b/lib/buildFileList.sh @@ -41,7 +41,7 @@ function BuildFileList() { if [ ${ERROR_CODE} -ne 0 ]; then # Error echo "Failed to switch to ${DEFAULT_BRANCH} branch to get files changed!" - fatal "[${SWITCH_CMD}]${NC}" + fatal "[${SWITCH_CMD}]" fi ################ @@ -68,8 +68,8 @@ function BuildFileList() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # Error - error "Failed to gain a list of all files changed!${NC}" - fatal "[${RAW_FILE_ARRAY[*]}]${NC}" + error "Failed to gain a list of all files changed!" + fatal "[${RAW_FILE_ARRAY[*]}]" fi ################################################ @@ -525,7 +525,7 @@ function BuildFileList() { if [ ${ERROR_CODE} -ne 0 ]; then # Error error "Failed to switch back to branch!" - fatal "[${SWITCH2_CMD}]${NC}" + fatal "[${SWITCH2_CMD}]" fi ################ diff --git a/lib/linter.sh b/lib/linter.sh index 9811ef5a..7bb5ec81 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -474,8 +474,8 @@ GetStandardRules() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # ERROR - error "Failed to gain list of ENV vars to load!${NC}" - fatal "[${GET_ENV_ARRAY[*]}]${NC}" + error "Failed to gain list of ENV vars to load!" + fatal "[${GET_ENV_ARRAY[*]}]" fi ########################## @@ -690,7 +690,7 @@ GetGitHubVars() { fi if [ ! -d "${GITHUB_WORKSPACE}" ]; then - fatal "Provided volume is not a directory!${NC}" + fatal "Provided volume is not a directory!" fi echo "Linting all files in mapped directory:[${DEFAULT_WORKSPACE}]" @@ -709,8 +709,8 @@ GetGitHubVars() { # Validate we have a value # ############################ if [ -z "${GITHUB_SHA}" ]; then - error "Failed to get [GITHUB_SHA]!${NC}" - fatal "[${GITHUB_SHA}]${NC}" + error "Failed to get [GITHUB_SHA]!" + fatal "[${GITHUB_SHA}]" else notice "Successfully found:${F[W]}[GITHUB_SHA]${F[B]}, value:${F[W]}[${GITHUB_SHA}]${NC}" fi @@ -719,8 +719,8 @@ GetGitHubVars() { # Validate we have a value # ############################ if [ -z "${GITHUB_WORKSPACE}" ]; then - error "Failed to get [GITHUB_WORKSPACE]!${NC}" - fatal "[${GITHUB_WORKSPACE}]${NC}" + error "Failed to get [GITHUB_WORKSPACE]!" + fatal "[${GITHUB_WORKSPACE}]" else notice "Successfully found:${F[W]}[GITHUB_WORKSPACE]${F[B]}, value:${F[W]}[${GITHUB_WORKSPACE}]${NC}" fi @@ -729,8 +729,8 @@ GetGitHubVars() { # Validate we have a value # ############################ if [ -z "${GITHUB_EVENT_PATH}" ]; then - error "Failed to get [GITHUB_EVENT_PATH]!${NC}" - fatal "[${GITHUB_EVENT_PATH}]${NC}" + error "Failed to get [GITHUB_EVENT_PATH]!" + fatal "[${GITHUB_EVENT_PATH}]" else notice "Successfully found:${F[W]}[GITHUB_EVENT_PATH]${F[B]}, value:${F[W]}[${GITHUB_EVENT_PATH}]${F[B]}${NC}" fi @@ -748,8 +748,8 @@ GetGitHubVars() { # Validate we have a value # ############################ if [ -z "${GITHUB_ORG}" ]; then - error "Failed to get [GITHUB_ORG]!${NC}" - fatal "[${GITHUB_ORG}]${NC}" + error "Failed to get [GITHUB_ORG]!" + fatal "[${GITHUB_ORG}]" else notice "Successfully found:${F[W]}[GITHUB_ORG]${F[B]}, value:${F[W]}[${GITHUB_ORG}]${NC}" fi @@ -763,8 +763,8 @@ GetGitHubVars() { # Validate we have a value # ############################ if [ -z "${GITHUB_REPO}" ]; then - error "Failed to get [GITHUB_REPO]!${NC}" - fatal "[${GITHUB_REPO}]${NC}" + error "Failed to get [GITHUB_REPO]!" + fatal "[${GITHUB_REPO}]" else notice "Successfully found:${F[W]}[GITHUB_REPO]${F[B]}, value:${F[W]}[${GITHUB_REPO}]${NC}" fi @@ -774,9 +774,9 @@ GetGitHubVars() { # Validate we have a value # ############################ if [ -z "${GITHUB_TOKEN}" ] && [[ ${RUN_LOCAL} == "false" ]]; then - error "Failed to get [GITHUB_TOKEN]!${NC}" - error "[${GITHUB_TOKEN}]${NC}" - error "Please set a [GITHUB_TOKEN] from the main workflow environment to take advantage of multiple status reports!${NC}" + error "Failed to get [GITHUB_TOKEN]!" + error "[${GITHUB_TOKEN}]" + error "Please set a [GITHUB_TOKEN] from the main workflow environment to take advantage of multiple status reports!" ################################################################################ # Need to set MULTI_STATUS to false as we cant hit API endpoints without token # @@ -799,8 +799,8 @@ GetGitHubVars() { # Validate we have a value # ############################ if [ -z "${GITHUB_REPOSITORY}" ]; then - error "Failed to get [GITHUB_REPOSITORY]!${NC}" - fatal "[${GITHUB_REPOSITORY}]${NC}" + error "Failed to get [GITHUB_REPOSITORY]!" + fatal "[${GITHUB_REPOSITORY}]" else notice "Successfully found:${F[W]}[GITHUB_REPOSITORY]${F[B]}, value:${F[W]}[${GITHUB_REPOSITORY}]${NC}" fi @@ -809,8 +809,8 @@ GetGitHubVars() { # Validate we have a value # ############################ if [ -z "${GITHUB_RUN_ID}" ]; then - error "Failed to get [GITHUB_RUN_ID]!${NC}" - fatal "[${GITHUB_RUN_ID}]${NC}" + error "Failed to get [GITHUB_RUN_ID]!" + fatal "[${GITHUB_RUN_ID}]" else notice "Successfully found:${F[W]}[GITHUB_RUN_ID]${F[B]}, value:${F[W]}[${GITHUB_RUN_ID}]${NC}" fi @@ -844,8 +844,8 @@ function ValidatePowershellModules() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # Failed - error "Failed find module [PSScriptAnalyzer] for [${LINTER_NAME}] in system!${NC}" - fatal "[PSSA_MODULE ${VALIDATE_PSSA_MODULE}] [PSSA_CMD ${VALIDATE_PSSA_CMD}]${NC}" + error "Failed find module [PSScriptAnalyzer] for [${LINTER_NAME}] in system!" + fatal "[PSSA_MODULE ${VALIDATE_PSSA_MODULE}] [PSSA_CMD ${VALIDATE_PSSA_CMD}]" else # Success if [[ ${ACTIONS_RUNNER_DEBUG} == "true" ]]; then @@ -969,7 +969,7 @@ Footer() { ################### # Print the goods # ################### - error "ERRORS FOUND${NC} in ${LANGUAGE}:[${!ERROR_COUNTER}]${NC}" + error "ERRORS FOUND${NC} in ${LANGUAGE}:[${!ERROR_COUNTER}]" ######################################### # Create status API for Failed language # @@ -1002,7 +1002,7 @@ Footer() { # Check if error was found if [ "${!ERRORS_FOUND_LANGUAGE}" -ne 0 ]; then # Failed exit - fatal "Exiting with errors found!${NC}" + fatal "Exiting with errors found!" fi done diff --git a/lib/worker.sh b/lib/worker.sh index 94fd2add..6d79ffc8 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -49,8 +49,8 @@ function LintCodebase() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # Failed - error "Failed to find [${LINTER_NAME}] in system!${NC}" - fatal "[${VALIDATE_INSTALL_CMD}]${NC}" + error "Failed to find [${LINTER_NAME}] in system!" + fatal "[${VALIDATE_INSTALL_CMD}]" else # Success if [[ ${ACTIONS_RUNNER_DEBUG} == "true" ]]; then @@ -225,9 +225,9 @@ function LintCodebase() { ######### # Error # ######### - error "Found errors in [${LINTER_NAME}] linter!${NC}" - error "[${LINT_CMD}]${NC}" - error "Linter CMD:[${LINTER_COMMAND} ${FILE}]${NC}" + error "Found errors in [${LINTER_NAME}] linter!" + error "[${LINT_CMD}]" + error "Linter CMD:[${LINTER_COMMAND} ${FILE}]" # Increment the error count (("ERRORS_FOUND_${FILE_TYPE}++")) @@ -301,8 +301,8 @@ function TestCodebase() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # Failed - error "Failed to find [${LINTER_NAME}] in system!${NC}" - fatal "[${VALIDATE_INSTALL_CMD}]${NC}" + error "Failed to find [${LINTER_NAME}] in system!" + fatal "[${VALIDATE_INSTALL_CMD}]" else # Success notice "Successfully found binary for ${F[W]}[${LINTER_NAME}]${F[B]} in system location: ${F[W]}[${VALIDATE_INSTALL_CMD}]${NC}" @@ -452,9 +452,9 @@ function TestCodebase() { ######### # Error # ######### - error "Found errors in [${LINTER_NAME}] linter!${NC}" - error "[${LINT_CMD}]${NC}" - error "Linter CMD:[${LINTER_COMMAND} ${FILE}]${NC}" + error "Found errors in [${LINTER_NAME}] linter!" + error "[${LINT_CMD}]" + error "Linter CMD:[${LINTER_COMMAND} ${FILE}]" # Increment the error count (("ERRORS_FOUND_${FILE_TYPE}++")) else @@ -480,11 +480,11 @@ function TestCodebase() { ######### # Error # ######### - error "Found errors in [${LINTER_NAME}] linter!${NC}" - error "This file should have failed test case!${NC}" - error "Command run:${NC}[\$${LINT_CMD}]${NC}" - error "[${LINT_CMD}]${NC}" - error "Linter CMD:[${LINTER_COMMAND} ${FILE}]${NC}" + error "Found errors in [${LINTER_NAME}] linter!" + error "This file should have failed test case!" + error "Command run:${NC}[\$${LINT_CMD}]" + error "[${LINT_CMD}]" + error "Linter CMD:[${LINTER_COMMAND} ${FILE}]" # Increment the error count (("ERRORS_FOUND_${FILE_TYPE}++")) else @@ -655,8 +655,8 @@ function LintAnsibleFiles() { ############################## if [ ${ERROR_CODE} -ne 0 ]; then # Failed - error "Failed to find ${LINTER_NAME} in system!${NC}" - fatal "[${VALIDATE_INSTALL_CMD}]${NC}" + error "Failed to find ${LINTER_NAME} in system!" + fatal "[${VALIDATE_INSTALL_CMD}]" else # Success if [[ ${ACTIONS_RUNNER_DEBUG} == "true" ]]; then @@ -773,8 +773,8 @@ function LintAnsibleFiles() { ######### # Error # ######### - error "Found errors in [${LINTER_NAME}] linter!${NC}" - error "[${LINT_CMD}]${NC}" + error "Found errors in [${LINTER_NAME}] linter!" + error "[${LINT_CMD}]" # Increment error count ((ERRORS_FOUND_ANSIBLE++))