From c4280ea4e19a1d73ba41dbf44ea5de0b0dc165ce Mon Sep 17 00:00:00 2001
From: Lukas Gravley <admiralawkbar@github.com>
Date: Thu, 10 Jun 2021 13:09:24 -0500
Subject: [PATCH] LINTER_RULE_PATH fix (#1649)

* adding root code

* removbe a typio
---
 lib/functions/linterRules.sh | 24 ++++++++++++++++++++++--
 lib/linter.sh                | 11 ++++++++++-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/lib/functions/linterRules.sh b/lib/functions/linterRules.sh
index 20969e35..62dcffa0 100755
--- a/lib/functions/linterRules.sh
+++ b/lib/functions/linterRules.sh
@@ -8,6 +8,15 @@
 ########################## FUNCTION CALLS BELOW ################################
 ################################################################################
 ################################################################################
+#### Function LinterRulesLocation ##############################################
+LinterRulesLocation() {
+  # We need to see if the user has set the rules location to the root
+  # directory, or to some nested folder
+  if [ "${LINTER_RULES_PATH}" == '.' ] || [ "${LINTER_RULES_PATH}" == '/' ]; then
+    LINTER_RULES_PATH=''
+  fi
+}
+################################################################################
 #### Function GetLinterRules ###################################################
 GetLinterRules() {
   # Need to validate the rules files exist
@@ -72,7 +81,13 @@ GetLinterRules() {
   #####################################
   # Validate we have the linter rules #
   #####################################
-  LANGUAGE_FILE_PATH="${GITHUB_WORKSPACE}/${LINTER_RULES_PATH}/${!LANGUAGE_FILE_NAME}"
+  LANGUAGE_FILE_PATH=''
+  if [ -z "${LINTER_RULES_PATH}" ]; then
+    LANGUAGE_FILE_PATH="${GITHUB_WORKSPACE}/${!LANGUAGE_FILE_NAME}"
+  else
+    LANGUAGE_FILE_PATH="${GITHUB_WORKSPACE}/${LINTER_RULES_PATH}/${!LANGUAGE_FILE_NAME}"
+  fi
+
   debug "Checking if the user-provided:[${!LANGUAGE_FILE_NAME}] and exists at:[${LANGUAGE_FILE_PATH}]"
   if [ -f "${LANGUAGE_FILE_PATH}" ]; then
     info "----------------------------------------------"
@@ -96,7 +111,12 @@ GetLinterRules() {
   ####################################################
   if [ -n "$SECONDARY_FILE_NAME" ] && [ "${SET_RULES}" -eq 0 ]; then
     # Set the path
-    SECONDARY_LANGUAGE_FILE_PATH="${GITHUB_WORKSPACE}/${LINTER_RULES_PATH}/${SECONDARY_FILE_NAME}"
+    SECONDARY_LANGUAGE_FILE_PATH=''
+    if [ -z "${LINTER_RULES_PATH}" ]; then
+      SECONDARY_LANGUAGE_FILE_PATH="${GITHUB_WORKSPACE}/${!LANGUAGE_FILE_NAME}"
+    else
+      SECONDARY_LANGUAGE_FILE_PATH="${GITHUB_WORKSPACE}/${LINTER_RULES_PATH}/${!LANGUAGE_FILE_NAME}"
+    fi
     debug "${LANGUAGE_NAME} language rule file has a secondary rules file name to check (${SECONDARY_FILE_NAME}). Path:[${SECONDARY_LANGUAGE_FILE_PATH}]"
 
     if [ -f "${SECONDARY_LANGUAGE_FILE_PATH}" ]; then
diff --git a/lib/linter.sh b/lib/linter.sh
index 117bb200..a544513a 100755
--- a/lib/linter.sh
+++ b/lib/linter.sh
@@ -776,6 +776,11 @@ export DEFAULT_TEST_CASE_ANSIBLE_DIRECTORY
 ############################
 GetValidationInfo
 
+#################################
+# Get the linter rules location #
+#################################
+LinterRulesLocation
+
 ########################
 # Get the linter rules #
 ########################
@@ -832,7 +837,11 @@ LINTER_COMMANDS_ARRAY['MARKDOWN']="markdownlint -c ${MARKDOWN_LINTER_RULES}"
 if [ -n "${MARKDOWN_CUSTOM_RULE_GLOBS}" ]; then
   IFS="," read -r -a MARKDOWN_CUSTOM_RULE_GLOBS_ARRAY <<<"${MARKDOWN_CUSTOM_RULE_GLOBS}"
   for glob in "${MARKDOWN_CUSTOM_RULE_GLOBS_ARRAY[@]}"; do
-    LINTER_COMMANDS_ARRAY['MARKDOWN']="${LINTER_COMMANDS_ARRAY['MARKDOWN']} -r ${GITHUB_WORKSPACE}/${LINTER_RULES_PATH}/${glob}"
+    if [ -z "${LINTER_RULES_PATH}" ]; then
+      LINTER_COMMANDS_ARRAY['MARKDOWN']="${LINTER_COMMANDS_ARRAY['MARKDOWN']} -r ${GITHUB_WORKSPACE}/${glob}"
+    else
+      LINTER_COMMANDS_ARRAY['MARKDOWN']="${LINTER_COMMANDS_ARRAY['MARKDOWN']} -r ${GITHUB_WORKSPACE}/${LINTER_RULES_PATH}/${glob}"
+    fi
   done
 fi
 LINTER_COMMANDS_ARRAY['OPENAPI']="spectral lint -r ${OPENAPI_LINTER_RULES}"