Logging improved

Author: Chris Wiechmann

action.yaml

@@ -9,6 +9,10 @@ inputs:
   apimHostname:
     description: "The API-Manager hostname without port or protocol."
     required: true
+  apimPort:
+    description: "The API-Manager port."
+    required: true
+    default: "8075"
   apimUsername:
     description: "The API-Manager username."
     required: true
@@ -31,7 +35,7 @@ inputs:
     description: "The directory containing your users. Each user in a separate directory."
     required: false
   apimCLICommand:
-    description: "Control the APIM-CLI command yourself. For example: 'apim api check-certs'. You may combine this with apimExtraArgs depending on you the command you use."
+    description: "Run an APIM-CLI command. For example: 'apim api check-certs'. You may combine this with apimExtraArgs depending on you the command you use."
     required: false
 runs:
   using: "docker"

entrypoint.sh

@@ -1,15 +1,13 @@
 #!/bin/bash
 
 CLI=/apim-cli-1.5.1/scripts/apim.sh
-echo "Using API-Manager: https://${INPUT_APIMHOSTNAME}:"
+echo "Using API-Manager: https://${INPUT_APIMHOSTNAME}:${INPUT_APIMPORT}"
 
-apimCLIArgs="-h ${INPUT_APIMHOSTNAME} -u ${INPUT_APIMUSERNAME} -p ${INPUT_APIMPASSWORD} ${INPUT_APIMEXTRAARGS}"
+apimCLIArgs="-h ${INPUT_APIMHOSTNAME} -port ${INPUT_APIMPORT} -u ${INPUT_APIMUSERNAME} -p ${INPUT_APIMPASSWORD} ${INPUT_APIMEXTRAARGS}"
 
 if ! [ -z ${INPUT_APIMCLICOMMAND} ];then
     echo "Calling APIM-CLI with given command: ${INPUT_APIMCLICOMMAND}"
-    set -x
     $CLI ${INPUT_APIMCLICOMMAND} ${apimCLIArgs} || exit 99;
-    exit
 fi
 
 # Import all users