Check for changed GenConfig remote URL and error out

packages/framework/get_dependencies.sh

@@ -36,8 +36,23 @@ function tril_genconfig_clone_or_update_repo() {
   echo
 
   if [[ -d ${sub_dir} ]] ; then
-    echo "STATUS: ${sub_dir}: Fetching remote repo"
     cd ${sub_dir}
+    # Validate correct remote and abort if not correct
+    remote=$(git remote get-url origin)
+    normalized_remote=$(python3 ${script_dir}/normalize_git_repo_url.py ${remote})
+    normalized_git_url=$(python3 ${script_dir}/normalize_git_repo_url.py ${git_url})
+    if [[ "${normalized_remote}" != "${normalized_git_url}" ]] ; then
+      echo "ERROR: Current remote origin does not match expected!" >&2
+      echo "   Current Remote:  ${remote}" >&2
+      echo "   Expected Remote: ${git_url}" >&2
+      echo "" >&2
+      echo "Please remove/move '$(pwd)' and re-run this script" >&2
+      echo "" >&2
+      echo "" >&2
+      exit 1
+    fi
+    # Update remote repo (which points to correct remote)
+    echo "STATUS: ${sub_dir}: Fetching remote repo"
     tril_genconfig_assert_pwd_is_git_repo
     cmd="git fetch"
     retry_command "${cmd}"

packages/framework/normalize_git_repo_url.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+
+import sys
+
+def removeStartingSubstr(inputStr, substrToRemove):
+  if inputStr.startswith(substrToRemove):
+    substrToRemoveLen = len(substrToRemove)
+    return inputStr[substrToRemoveLen:]
+  return inputStr
+
+def removeTrailingSubstr(inputStr, substrToRemove):
+  if inputStr.endswith(substrToRemove):
+    substrToRemoveLen = len(substrToRemove)
+    return inputStr[:-substrToRemoveLen]
+  return inputStr
+
+def normalizeGitRepoUrl(inputUrl):
+  url = inputUrl
+  url = removeStartingSubstr(url, "https://")
+  url = removeStartingSubstr(url, "git@")
+  url = removeTrailingSubstr(url, ".git")
+  url = url.replace(":", "/")
+  url = url.lower()
+  return url
+
+# Main
+
+def main():
+  if len(sys.argv) != 2:
+    print("Usage: normalize_git_repo_url.py <string>")
+    sys.exit(1)
+  inputUrl = sys.argv[1]
+  print(normalizeGitRepoUrl(inputUrl))
+
+if __name__ == "__main__":
+    main()