Merge pull request #47872 from Expensify/jpersaud_fix_redirect_script

[No QA] Updating our redirects and helper scripts

.github/scripts/createHelpRedirects.sh

@@ -27,32 +27,6 @@ function checkCloudflareResult {
 declare -a ITEMS_TO_ADD
 
 while read -r line; do
- # Split each line of the file into a source and destination so we can sanity check
- # and compare against the current list.
- read -r -a LINE_PARTS < <(echo "$line" | tr ',' ' ')
- SOURCE_URL=${LINE_PARTS[0]}
- DEST_URL=${LINE_PARTS[1]}
-
- # Make sure the format of the line is as execpted.
- if [[ "${#LINE_PARTS[@]}" -gt 2 ]]; then
- error "Found a line with more than one comma: $line"
- exit 1
- fi
-
- # Basic sanity checking to make sure that the source and destination are in expected
- # subdomains.
- if ! [[ $SOURCE_URL =~ ^https://(community|help)\.expensify\.com ]]; then
- error "Found source URL that is not a communityDot or helpDot URL: $SOURCE_URL"
- exit 1
- fi
-
- if ! [[ $DEST_URL =~ ^https://(help|use|integrations)\.expensify\.com|^https://www\.expensify\.org ]]; then
- error "Found destination URL that is not a supported URL: $DEST_URL"
- exit 1
- fi
-
- info "Source: $SOURCE_URL and destination: $DEST_URL appear to be formatted correctly."
-
  ITEMS_TO_ADD+=("$line")
 
 # This line skips the first line in the csv because the first line is a header row.
@@ -83,6 +57,9 @@ done | jq -n '. |= [inputs]')
 
 info "Adding redirects for $PUT_JSON"
 
+# Dump $PUT_JSON into a file otherwise the curl request below will fail with too many arguments
+echo "$PUT_JSON" > redirects.json
+
 # We use PUT here instead of POST so that we replace the entire list in place. This has many benefits:
 # 1. We don't have to check if items are already in the list, allowing this script to run faster
 # 2. We can support deleting redirects this way by simply removing them from the list
@@ -93,7 +70,7 @@ info "Adding redirects for $PUT_JSON"
 PUT_RESULT=$(curl -s --request PUT --url "https://api.cloudflare.com/client/v4/accounts/$ZONE_ID/rules/lists/$LIST_ID/items" \
  --header 'Content-Type: application/json' \
  --header "Authorization: Bearer $CLOUDFLARE_LIST_TOKEN" \
- --data "$PUT_JSON")
+ --data-binary @redirects.json)
 
 checkCloudflareResult "$PUT_RESULT"
 OPERATION_ID=$(echo "$PUT_RESULT" | jq -r .result.operation_id)

.github/scripts/verifyRedirect.sh

@@ -3,7 +3,10 @@
 # HelpDot - Verifies that redirects.csv does not have any duplicates
 # Duplicate sourceURLs break redirection on cloudflare pages
 
+source scripts/shellUtils.sh
+
 declare -r REDIRECTS_FILE="docs/redirects.csv"
+declare -a ITEMS_TO_ADD
 
 declare -r RED='\033[0;31m'
 declare -r GREEN='\033[0;32m'
@@ -22,5 +25,44 @@ if [[ DETECT_CYCLE_EXIT_CODE -eq 1 ]]; then
  exit 1
 fi
 
+while read -r line; do
+ # Split each line of the file into a source and destination so we can sanity check
+ # and compare against the current list.
+ read -r -a LINE_PARTS < <(echo "$line" | tr ',' ' ')
+ SOURCE_URL=${LINE_PARTS[0]}
+ DEST_URL=${LINE_PARTS[1]}
+
+ # Make sure the format of the line is as expected.
+ if [[ "${#LINE_PARTS[@]}" -gt 2 ]]; then
+ error "Found a line with more than one comma: $line"
+ exit 1
+ fi
+
+ # Basic sanity checking to make sure that the source and destination are in expected
+ # subdomains.
+ if ! [[ $SOURCE_URL =~ ^https://(community|help)\.expensify\.com ]] || [[ $SOURCE_URL =~ \# ]]; then
+ error "Found source URL that is not a communityDot or helpDot URL, or contains a '#': $SOURCE_URL"
+ exit 1
+fi
+
+ if ! [[ $DEST_URL =~ ^https://(help|use|integrations)\.expensify\.com|^https://www\.expensify\.org ]]; then
+ error "Found destination URL that is not a supported URL: $DEST_URL"
+ exit 1
+ fi
+
+ info "Source: $SOURCE_URL and destination: $DEST_URL appear to be formatted correctly."
+
+ ITEMS_TO_ADD+=("$line")
+
+# This line skips the first line in the csv because the first line is a header row.
+done <<< "$(tail +2 $REDIRECTS_FILE)"
+
+# Sanity check that we should actually be running this and we aren't about to delete
+# every single redirect.
+if [[ "${#ITEMS_TO_ADD[@]}" -lt 1 ]]; then
+ error "No items found to add, why are we running?"
+ exit 1
+fi
+
 echo -e "${GREEN}The redirects.csv is valid!${NC}"
 exit 0

docs/redirects.csv

@@ -477,7 +477,6 @@ https://community.expensify.com/discussion/5321/how-to-set-up-saml-authenticatio
 https://community.expensify.com/discussion/5499/deep-dive-configure-coding-for-sage-intacct,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Configure-Sage-Intacct
 https://community.expensify.com/discussion/5580/deep-dive-configure-advanced-settings-for-netsuite,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite#step-3-configure-advanced-settings
 https://community.expensify.com/discussion/5632/deep-dive-configure-coding-for-netsuite,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite#configure-netsuite-integration
-https://community.expensify.com/discussion/5632/deep-dive-configure-coding-for-netsuite#tax,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite#configure-netsuite-integration
 https://community.expensify.com/discussion/5649/deep-dive-configure-advanced-settings-for-quickbooks-online,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Configure-Quickbooks-Online
 https://community.expensify.com/discussion/5654/deep-dive-using-expense-rules-to-vendor-match-when-exporting-to-an-accounting-package,https://help.expensify.com/articles/expensify-classic/expenses/Expense-Rules#how-can-i-use-expense-rules-to-vendor-match-when-exporting-to-an-accounting-package
 https://community.expensify.com/discussion/5656/deep-dive-configure-coding-for-xero/,https://help.expensify.com/articles/new-expensify/connections/xero/Connect-to-Xero#step-2-configure-import-settings
@@ -490,7 +489,6 @@ https://community.expensify.com/discussion/5864/how-to-add-a-personal-bank-accou
 https://community.expensify.com/discussion/5941/how-to-reimburse-overseas-employees-for-us-employers/,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements
 https://community.expensify.com/discussion/6203/deep-dive-expensify-card-and-netsuite-auto-reconciliation-how-it-works,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Reconciliation
 https://community.expensify.com/discussion/6698/faq-troubleshooting-bank-and-card-errors,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting
-https://community.expensify.com/discussion/6698/faq-troubleshooting-bank-and-card-errors#account-type-not-supported,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting
 https://community.expensify.com/discussion/6827/what-s-happening-to-my-expensify-bill,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview
 https://community.expensify.com/discussion/6898/deep-dive-guide-to-billing,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview
 https://community.expensify.com/discussion/7231/how-to-export-invoices-to-netsuite,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite#export-invoices-to