Merge pull request #70 from entando/ENG-5355-force-url-scheme

ENG-5355: removes fallback in FORCE_URL_SCHEME

s/ecr-utils.sh

@@ -19,17 +19,16 @@ ecr-prepare-action() {
   app-get-main-ingresses url_scheme main_ingress ecr_ingress ignored
   [ -z "$main_ingress" ] && FATAL "Unable to determine the main ingress url (s1)"
   [ -z "$ecr_ingress" ] && FATAL "Unable to determine the ecr ingress url (s1)"
-  if [ -n "$url_scheme" ]; then
-    main_ingress="$url_scheme://$main_ingress"
-  else
-    case "$FORCE_URL_SCHEME" in
+  case "$FORCE_URL_SCHEME" in
       "http")
-        http-get-working-url main_ingress "http://$main_ingress" "https://$main_ingress"
+        url_scheme=http
         ;;
-      *)
-        http-get-working-url main_ingress "https://$main_ingress" "http://$main_ingress"
+      "https")
+        url_scheme="https"
         ;;
-    esac
+  esac
+  if [ -n "$url_scheme" ]; then
+    main_ingress="$url_scheme://$main_ingress"
   fi
   [ -z "$main_ingress" ] && FATAL "Unable to determine the main ingress url (s2)"
   http-get-url-scheme url_scheme "$main_ingress"

s/utils.sh

@@ -899,23 +899,6 @@ http-get-url-scheme() {
   _set_var "$1" "${2//:\/\/*/}"
 }
 
-http-get-working-url() {
-  local res_var="$1"
-  shift
-  local res
-  if http-check "$1" --accept-401; then
-    res="$1"
-  else
-    if http-check "$2" --accept-401; then
-      res="$2"
-    else
-      res=""
-    fi
-  fi
-
-  _set_var "$res_var" "$res"
-}
-
 #-----------------------------------------------------------------------------------------------------------------------
 # Retrieve the main application ingresses:
 # $1: var for the scheme