Fix default values

cloudfoundry-community · Feb 5, 2024 · 25679ce · 25679ce
1 parent 29b90fa
commit 25679ce
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/out b/out
@@ -37,10 +37,10 @@ icon_url=$(  jq --raw-output '.params.icon_url   // empty'                  <<<
 icon_emoji=$(jq --raw-output '.params.icon_emoji // empty'                  <<< "${payload}")
 link_names=$(jq --raw-output '.params.link_names // false'                  <<< "${payload}")
 
-channels=$(        jq --raw-output '.params.channel // null'           <<< "${payload}")
-channel_file=$(    jq --raw-output '.params.channel_file // null'      <<< "${payload}")
+channels=$(        jq --raw-output '.params.channel          // empty' <<< "${payload}")
+channel_file=$(    jq --raw-output '.params.channel_file     // empty' <<< "${payload}")
 attachments_file=$(jq --raw-output '.params.attachments_file // empty' <<< "${payload}")
-attachments=$(     jq --raw-output '.params.attachments // null'       <<< "${payload}")
+attachments=$(     jq --raw-output '.params.attachments      // empty' <<< "${payload}")
 
 debug=$(        jq --raw-output '.params.debug               // false' <<< "${payload}")
 show_metadata=$(jq --raw-output '.params.metadata            // false' <<< "${payload}")
@@ -83,7 +83,7 @@ ATTACHMENTS_FILE_CONTENT=""
 if [[ -n "${attachments_file}" && -f "${attachments_file}" ]]; then
     ATTACHMENTS_FILE_CONTENT=$(< "${attachments_file}")
 fi
-if [[ "${attachments}" == "null" && -n "${ATTACHMENTS_FILE_CONTENT}" ]]; then
+if [[ -z "${attachments}" && -n "${ATTACHMENTS_FILE_CONTENT}" ]]; then
     attachments="${ATTACHMENTS_FILE_CONTENT}"
 fi
 
@@ -135,21 +135,21 @@ for channel in ${channels}; do
 
         body=$(
             jq --null-input \
-                --arg "text_interpolated" "${text_interpolated}" \
-                --arg "username"          "${username}" \
-                --arg "link_names"        "${link_names}" \
+                --arg     "text_interpolated" "${text_interpolated}" \
+                --arg     "username"          "${username}" \
+                --argjson "link_names"        "${link_names}" \
                 --arg "icon_url"          "${icon_url}" \
                 --arg "icon_emoji"        "${icon_emoji}" \
                 --arg "channel"           "${channel}" \
                 --arg "attachments"       "${attachments}" \
                 '{
                     text:        $text_interpolated,
-                    username:    $username,
+                    username:    $username    // null,
                     link_names:  $link_names,
-                    icon_url:    $icon_url,
-                    icon_emoji:  $icon_emoji,
-                    channel:     $channel,
-                    attachments: $attachments
+                    icon_url:    $icon_url    // null,
+                    icon_emoji:  $icon_emoji  // null,
+                    channel:     $channel     // null,
+                    attachments: $attachments // null
                 }'
         )