updated push_build_artifacts.sh to search config for extraBuildArtifacts for tag as well as repository and directory. Updated logging for login container registry

Author: alexlianides

build/push_build_artifact.sh

@@ -302,14 +302,22 @@ function main() {
     DEST_ARTIFACT_TAG="${ARTIFACT_VERSION}"
     DEST_SPACEFX_TAG="${SPACEFX_VERSION}"
 
-    # Check if we have a tag suffix from our config file
-    run_a_script "jq -r 'if (.config | has(\"tagSuffix\")) then .config.tagSuffix else \"\" end' ${SPACEFX_DIR}/tmp/config/spacefx-config.json" tag_suffix --disable_log
+    # Look in extraBuildArtifacts to see if a specfic tag is required
+    run_a_script "jq -r '.config.extraBuildArtifacts // empty | map(select(.file == \"${fileName}\")) | if length > 0 then .[0] | @base64 else \"\" end' ${SPACEFX_DIR}/tmp/config/spacefx-config.json" build_artifact --disable_log --ignore_error
 
-    if [[ -n "${tag_suffix}" ]]; then
-        DEST_ARTIFACT_TAG="${ARTIFACT_VERSION}${tag_suffix}"
-        DEST_SPACEFX_TAG="${SPACEFX_VERSION}${tag_suffix}"
-    fi
+    # Found the in extraBuildArtifacts, confirmed static artifact
+    if [[ -n "${build_artifact}" ]]; then
+        info_log "..found '${fileName}' in build artifacts."
+         DEST_ARTIFACT_TAG="${ARTIFACT_VERSION}"
+    else
+        # artifact is not static, check if we have a tag suffix from our config file
+        run_a_script "jq -r 'if (.config | has(\"tagSuffix\")) then .config.tagSuffix else \"\" end' ${SPACEFX_DIR}/tmp/config/spacefx-config.json" tag_suffix --disable_log
 
+        if [[ -n "${tag_suffix}" ]]; then
+            DEST_ARTIFACT_TAG="${ARTIFACT_VERSION}${tag_suffix}"
+            DEST_SPACEFX_TAG="${SPACEFX_VERSION}${tag_suffix}"
+        fi
+    fi
 
     write_parameter_to_log DEST_ARTIFACT_TAG
     write_parameter_to_log DEST_SPACEFX_TAG

modules/m_60_container_registries.sh

@@ -239,8 +239,12 @@ function find_registry_for_image(){
             login_to_container_registry --container_registry "${container_registry}" --container_registry_username_file "${login_username_file}" --container_registry_password_file "${login_password_file}"
         fi
 
+        debug_log "Running 'regctl image manifest ${container_registry}/${_find_registry_for_image_repo}'"
         run_a_script "regctl image manifest ${container_registry}/${_find_registry_for_image_repo}" _find_registry_for_image_result --ignore_error --disable_log
+        debug_log "_find_registry_for_image_result:"
+        debug_log "${_find_registry_for_image_result}"
 
+        
         if [[ "${_find_registry_for_image_result}" == *"unauthorized"* ]]; then
             exit_with_error "Unauthorized to access image to container registry '${container_registry}'.  Please login with docker login '${container_registry}', regctl registry login '${container_registry}' --user <username> --pass <password>, or use the config login_username_file and login_password_file configuration options"
         fi