Fix new issues

This commit is contained in:
Eric Nemchik 2020-06-30 09:56:15 -05:00
parent 889179e0bf
commit c6594d8fb5
4 changed files with 14 additions and 29 deletions

View file

@ -22,5 +22,5 @@ fi
######################### #########################
export RUN_LOCAL=true export RUN_LOCAL=true
# shellcheck source=../lib/linter.sh # shellcheck source=/dev/null
source "$PWD"/lib/linter.sh source "$PWD"/lib/linter.sh

View file

@ -411,7 +411,7 @@ function BuildFileList()
fi fi
done done
echo $READ_ONLY_CHANGE_FLAG > /dev/null 2>&1 || true # Workaround SC2034 echo ${READ_ONLY_CHANGE_FLAG} > /dev/null 2>&1 || true # Workaround SC2034
######################################### #########################################
# Need to switch back to branch of code # # Need to switch back to branch of code #

View file

@ -9,11 +9,11 @@
######################### #########################
# Source Function Files # # Source Function Files #
######################### #########################
# shellcheck source=../lib/buildFileList.sh # shellcheck source=/dev/null
source /action/lib/buildFileList.sh # Source the function script(s) source /action/lib/buildFileList.sh # Source the function script(s)
# shellcheck source=../lib/validation.sh # shellcheck source=/dev/null
source /action/lib/validation.sh # Source the function script(s) source /action/lib/validation.sh # Source the function script(s)
# shellcheck source=../lib/worker.sh # shellcheck source=/dev/null
source /action/lib/worker.sh # Source the function script(s) source /action/lib/worker.sh # Source the function script(s)
########### ###########
@ -150,10 +150,15 @@ DEFAULT_IFS="$IFS" # Get the Default IFS for updating
# Default Vars that are called in Subs and need to be ignored # # Default Vars that are called in Subs and need to be ignored #
############################################################### ###############################################################
DEFAULT_DISABLE_ERRORS='false' # Default to enabling errors DEFAULT_DISABLE_ERRORS='false' # Default to enabling errors
echo "${DEFAULT_DISABLE_ERRORS}" > /dev/null 2>&1 || true # Workaround SC2034
RAW_FILE_ARRAY=() # Array of all files that were changed RAW_FILE_ARRAY=() # Array of all files that were changed
echo "${RAW_FILE_ARRAY[*]}" > /dev/null 2>&1 || true # Workaround SC2034
READ_ONLY_CHANGE_FLAG=0 # Flag set to 1 if files changed are not txt or md READ_ONLY_CHANGE_FLAG=0 # Flag set to 1 if files changed are not txt or md
echo "${READ_ONLY_CHANGE_FLAG}" > /dev/null 2>&1 || true # Workaround SC2034
TEST_CASE_FOLDER='.automation/test' # Folder for test cases we should always ignore TEST_CASE_FOLDER='.automation/test' # Folder for test cases we should always ignore
echo "${TEST_CASE_FOLDER}" > /dev/null 2>&1 || true # Workaround SC2034
DEFAULT_ANSIBLE_DIRECTORY="$GITHUB_WORKSPACE/ansible" # Default Ansible Directory DEFAULT_ANSIBLE_DIRECTORY="$GITHUB_WORKSPACE/ansible" # Default Ansible Directory
echo "${DEFAULT_ANSIBLE_DIRECTORY}" > /dev/null 2>&1 || true # Workaround SC2034
########################## ##########################
# Array of changed files # # Array of changed files #

View file

@ -253,30 +253,10 @@ function TestCodebase()
########################## ##########################
LIST_FILES=() LIST_FILES=()
############################################
# Check if its ansible, as its the outlier #
############################################
if [[ "$FILE_TYPE" == "ANSIBLE" ]]; then
################################# #################################
# Get list of all files to lint # # Get list of all files to lint #
################################# #################################
mapfile -t LIST_FILES < <(ls "$GITHUB_WORKSPACE/$TEST_CASE_FOLDER/ansible/*.yml" 2>&1) mapfile -t LIST_FILES < <(find "$GITHUB_WORKSPACE/$TEST_CASE_FOLDER/$INDVIDUAL_TEST_FOLDER" -type f -regex "$FILE_EXTENSIONS" ! -path "$GITHUB_WORKSPACE/$TEST_CASE_FOLDER/ansible/ghe-initialize/*" 2>&1)
else
###############################################################################
# Set the file seperator to newline to allow for grabbing objects with spaces #
###############################################################################
IFS=$'\n'
#################################
# Get list of all files to lint #
#################################
mapfile -t LIST_FILES < <(find "$GITHUB_WORKSPACE/$TEST_CASE_FOLDER/$INDVIDUAL_TEST_FOLDER" -type f -regex "$FILE_EXTENSIONS" ! -path "*./ansible*" 2>&1)
###########################
# Set IFS back to default #
###########################
IFS="$DEFAULT_IFS"
fi
################## ##################
# Lint the files # # Lint the files #