Merge pull request #18 from QualiTorque/dev

Author: ddovbii

action.yaml

@@ -1,52 +1,51 @@
-name: 'Start Torque Environment'
-description: 'Starts an Environment in Torque and returns its details'
-author: 'Quali'
+name: "Start Torque Environment"
+description: "Starts an Environment in Torque and returns its details"
+author: "Quali"
 inputs:
   space:
-    description: 'The Torque space to start the environment in'
+    description: "The Torque space to start the environment in"
     required: true
   blueprint_name:
-    description: 'The name of the Blueprint to use'
+    description: "The name of the Blueprint to use"
     required: true
   repository_name:
-    description: 'The Blueprint repository name'
+    description: "The Blueprint repository name"
   environment_name:
-    description: 'Provide a name for the Environment'
+    description: "Provide a name for the Environment"
     required: false
-    default: gh-build-${{ github.repository }}
   torque_token:
-    description: 'A Torque longterm token'
+    description: "A Torque longterm token"
     required: true
   torque_hostname:
-    description: 'Alternative Torque server url'
+    description: "Alternative Torque server url"
     required: false
     default: portal.qtorque.io
   branch:
-    description: 'Use the Blueprint version from a remote Git branch'
+    description: "Use the Blueprint version from a remote Git branch"
     required: false
     default: ""
   duration:
-    description: 'The Environment will automatically de-provision at the end of the provided duration (minutes)'
+    description: "The Environment will automatically de-provision at the end of the provided duration (minutes)"
     required: false
-    default: '120'
+    default: "120"
   timeout:
-    description: 'Set the time (minutes) to wait for the environment to become active. When setting to 0 the action will end with just the Environment ID output.'
+    description: "Set the time (minutes) to wait for the environment to become active. When setting to 0 the action will end with just the Environment ID output."
     required: false
     default: 0
   inputs:
     required: false
-    description: 'A comma-separated list of key=value pairs. For example: key1=value1, key2=value2'
+    description: "A comma-separated list of key=value pairs. For example: key1=value1, key2=value2"
     default: ""
 
 outputs:
   environment_id:
-    description: 'The ID of launched Torque Environment'
+    description: "The ID of launched Torque Environment"
   environment_details:
-    description: 'The Full Environment details in a json format'
+    description: "The Full Environment details in a json format"
 
 runs:
   using: "docker"
-  image: 'Dockerfile'
+  image: "Dockerfile"
   args:
     - ${{ inputs.blueprint_name }}
     - ${{ inputs.repository_name }}
@@ -61,7 +60,7 @@ runs:
     TORQUE_SPACE: ${{ inputs.space }}
     TORQUE_HOSTNAME: ${{ inputs.torque_hostname }}
     TORQUE_USERAGENT: Torque-Plugin-Github-Start-Environment-Action/v1
-        
+
 branding:
-  icon: 'play-circle'  
-  color: 'blue'
+  icon: "play-circle"
+  color: "blue"

entrypoint.sh

@@ -1,30 +1,34 @@
 #!/bin/sh -l
 
-BP_NAME=$1
-REPO_NAME=$2
-ENV_NAME=$3
-BRANCH=$4
-DURATION=$5
-TIMEOUT=$6
-INPUTS=$7
+BP_NAME="$1"
+REPO_NAME="$2"
+ENV_NAME="$3"
+BRANCH="$4"
+DURATION="$5"
+TIMEOUT="$6"
+INPUTS="$7"
+
+ENV_NAME="${ENV_NAME:-$BP_NAME-build-$GITHUB_RUN_NUMBER}"
 
 echo "Running torque start environment command"
-params="${BP_NAME} --repo ${REPO_NAME} -n ${ENV_NAME} -d ${DURATION}"
+params="\"${BP_NAME}\" --repo \"${REPO_NAME}\" -n \"${ENV_NAME}\" -d \"${DURATION}\""
 
 if [ "$TIMEOUT" -gt 0 ]; then
     params="$params -w -t ${TIMEOUT}"
 fi
-if [ ! -z ${INPUTS} ]; then
-    params="$params -i ${INPUTS}"
+if [ ! -z "${INPUTS}" ]; then
+    params="$params -i \"${INPUTS}\""
 fi
-if [ ! -z ${BRANCH} ]; then
-    params="$params -b ${BRANCH}"
+if [ ! -z "${BRANCH}" ]; then
+    params="$params -b \"${BRANCH}\""
 fi
 
-echo "The following parameters will be used: ${params}"
+command="torque --disable-version-check env start ${params} --output=json"
+echo "The following command will be executed: ${command}"
 
 echo "Starting the environment..."
-response=$(torque --disable-version-check env start ${params} --output=json) || exit 1
+response=$(eval $command) || exit 1
+# response=$(torque --disable-version-check env start ${params} --output=json) || exit 1
 environment_id=$(echo "$response" | tr -d '"')
 echo "Started environment with id '${environment_id}'"