nit: refactor when uri is checked

Signed-off-by: Taylor Silva <dev@taydev.net>

Author: taylorsilva

assets/check

@@ -38,6 +38,10 @@ configure_credentials "$payload"
 destination=$TMPDIR/git-resource-repo-cache
 uri=$(jq -r '.source.uri // ""' <<< "$payload")
 uri=${uri# }
+if [[ -z "$uri" ]]; then
+    echo "source.uri is required and must not be empty"
+    exit 1
+fi
 
 version_type=$(jq -r '.source.version_type // "commits"' <<< "$payload")
 

assets/check_commits.sh

@@ -16,11 +16,6 @@ filter_exclude_all_match=$(jq -r '.source.commit_filter.exclude_all_match // fal
 version_depth=$(jq -r '.source.version_depth // 1' <<< "$payload")
 reverse=false
 
-if [[ -z "$uri" ]]; then
-    echo "source.uri is required and must not be empty"
-    exit 1
-fi
-
 # Optimization when last commit only is checked and skip ci is disabled
 # Get the commit id with git ls-remote instead of downloading the whole repo
 if [ "$skip_ci_disabled" = "true" ] && \

assets/in

@@ -51,6 +51,10 @@ configure_credentials "$payload"
 # These vars are used by multiple version_type's
 uri=$(jq -r '.source.uri // ""' <<< "$payload")
 uri=${uri# }
+if [[ -z "$uri" ]]; then
+    echo "source.uri is required and must not be empty"
+    exit 1
+fi
 
 version_type=$(jq -r '.source.version_type // "commits"' <<< "$payload")
 

assets/in_commits.sh

@@ -26,12 +26,6 @@ if [ -z "$fetch_tags" ] || [ "$fetch_tags" == "null" ]  ; then
   fetch_tags=$(jq -r '.source.fetch_tags' <<< "$payload")
 fi
 
-if [ -z "$uri" ]; then
-  echo "invalid payload (missing uri):"
-  cat $payload
-  exit 1
-fi
-
 branchflag=""
 if [ -n "$branch" ]; then
   branchflag="--branch $branch"

assets/in_tags.sh

@@ -10,12 +10,6 @@ gpg_keyserver=$(jq -r '.source.gpg_keyserver // "hkp://keyserver.ubuntu.com/"' <
 short_ref_format=$(jq -r '(.params.short_ref_format // "%s")' <<< "$payload")
 timestamp_format=$(jq -r '(.params.timestamp_format // "iso8601")' <<< "$payload")
 
-if [ -z "$uri" ]; then
-  echo "invalid payload (missing uri):"
-  cat $payload
-  exit 1
-fi
-
 if [ "$disable_git_lfs" == "true" ]; then
   # skip the fetching of LFS objects for all following git commands
   export GIT_LFS_SKIP_SMUDGE=1
@@ -86,7 +80,7 @@ if [ "$submodules" != "none" ]; then
     fi
 
     # check for ssh submodule_credentials
-    submodule_cred=$(jq --arg submodule_url "${submodule_url}" '.source.submodule_credentials // [] | [.[] | select(.url==$submodule_url)] | first // empty' <<< ${payload})
+    submodule_cred=$(jq --arg submodule_url "${submodule_url}" '.source.submodule_credentials // [] | [.[] | select(.url==$submodule_url)] | first // empty' <<< "${payload}")
 
     if [[ -z ${submodule_cred} ]]; then
 

assets/out

@@ -45,6 +45,10 @@ configure_credentials "$payload"
 # These vars are used by multiple version_type's
 uri=$(jq -r '.source.uri // ""' <<< "$payload")
 uri=${uri# }
+if [[ -z "$uri" ]]; then
+    echo "source.uri is required and must not be empty"
+    exit 1
+fi
 
 version_type=$(jq -r '.source.version_type // "commits"' <<< "$payload")
 

assets/out_commits.sh

@@ -16,18 +16,13 @@ push_options=$(jq -r '.params.push_options // []' <<< "$payload")
 # useful for pushing to special ref types like refs/for in gerrit.
 refs_prefix=$(jq -r '.params.refs_prefix // "refs/heads"' <<< "$payload")
 
-if [ -z "$uri" ]; then
-  echo "invalid payload (missing uri)"
-  exit 1
-fi
-
 if [ -z "$branch" ] && [ "$only_tag" != "true" ] && [ -z "$override_branch" ]; then
-  echo "invalid payload (missing branch)"
+  echo "invalid payload. Must specify one of: source.branch, params.branch, or set params.only_tag=true"
   exit 1
 fi
 
 if [ -z "$repository" ]; then
-  echo "invalid payload (missing repository)"
+  echo "invalid payload (missing params.repository)"
   exit 1
 fi