Fix: Ensure that empty array of labels causes graceful exit (#123)

* Ensure that empty array of labels causes graceful exit * Changes to create_update_pr.sh affect stackrox and collector repos
stackrox · Mar 16, 2022 · 67b3694 · 67b3694
1 parent 7c87afd
commit 67b3694
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.circleci/changes_affect.sh b/.circleci/changes_affect.sh
@@ -29,7 +29,8 @@ affects_all() {
 }
 
 affects_collector() {
-  [[ " $* " =~ [[:space:]]images/collector.Dockerfile[[:space:]] ]]
+  [[ " $* " =~ [[:space:]]images/collector.Dockerfile[[:space:]] ]] \
+  || [[ " $* " =~ [[:space:]]images/static-contents/scripts/create_update_pr.sh[[:space:]] ]]
 }
 
 affects_scanner() {
@@ -41,7 +42,8 @@ affects_stackrox() {
     || [[ " $* " =~ [[:space:]]images/stackrox-build.Dockerfile[[:space:]] ]] \
     || [[ " $* " =~ [[:space:]]images/stackrox-test.Dockerfile[[:space:]] ]] \
     || [[ " $* " =~ [[:space:]]images/circleci.Dockerfile[[:space:]] ]] \
-    || [[ " $* " =~ [[:space:]]images/static-contents/etc/yum.repos.d/google-cloud-sdk.repo[[:space:]] ]]
+    || [[ " $* " =~ [[:space:]]images/static-contents/etc/yum.repos.d/google-cloud-sdk.repo[[:space:]] ]] \
+    || [[ " $* " =~ [[:space:]]images/static-contents/scripts/create_update_pr.sh[[:space:]] ]]
 }
 
 affects_jenkins-plugin() {

diff --git a/images/static-contents/scripts/create_update_pr.sh b/images/static-contents/scripts/create_update_pr.sh
@@ -71,10 +71,10 @@ main() {
   echo "Assigning PR to: '${CIRCLE_USERNAME}'"
   set_assignee "$repo_name" "$pr_number" "$CIRCLE_USERNAME"
 
-  [[ "${#labels}" -gt 0 ]] || return 0
+  [[ "${#labels[@]}" -gt 0 ]] || return 0 # no labels to set
   local labels_to_add=()
   for label in "${labels[@]}"; do
-    if array_contains "$label" "${known_labels[@]}"; then
+    if [[ -n "$label" ]] && array_contains "$label" "${known_labels[@]}"; then
       labels_to_add+=( "$label" )
     else
       echo "Skipping label '$label'"