fixup

Author: steffyP

ephemeral/startup/retry-function.sh ephemeral/retry-function.shephemeral/startup/retry-function.sh renamed to ephemeral/retry-function.sh

@@ -39,21 +39,25 @@ runs:
         CONTENT_TYPE_HEADER="content-type: application/json"
         API_URL_BASE="https://api.localstack.cloud/v1/compute/instances"
 
-        source ${{ github.action_path }}/retry-function.sh
+        source ${{ github.action_path }}/../retry-function.sh
         shutdown_instance() {
             # The API returns a 200 on successful deletion.
             # We use --fail-with-body so curl fails on server errors (5xx) and triggers the retry.
             # We allow a 404 since that means the instance is already gone.
+            local http_code
             http_code=$(curl --fail-with-body -s -o /dev/null -w "%{http_code}" -X DELETE \
                 -H "$AUTH_HEADER" \
                 -H "$CONTENT_TYPE_HEADER" \
                 "$API_URL_BASE/$previewName")
-            if [ $? -eq 0 ]; then
-              if [ "$http_code" -eq 200 ]; then
-                  echo "Instance '$previewName' deleted successfully."
-              elif [ "$http_code" -eq 404 ]; then
-                  echo "Instance '$previewName' was already deleted (not found)."
-              fi
+            local exit_code=$?
+            if [ $exit_code -ne 0 ]; then
+              echo "Error deleting instance, curl failed with exit code $exit_code. API response: $http_code" >&2
+              return 1
+            fi
+            if [ "$http_code" -eq 200 ]; then
+                echo "Instance '$previewName' deleted successfully."
+            elif [ "$http_code" -eq 404 ]; then
+                echo "Instance '$previewName' was already deleted (not found)."
             fi
         }
         retry shutdown_instance

ephemeral/shutdown/action.yml

@@ -63,7 +63,7 @@ runs:
         CONTENT_TYPE_HEADER="content-type: application/json"
         API_URL_BASE="https://api.localstack.cloud/v1/compute/instances"
 
-        source ${{ github.action_path }}/retry-function.sh
+        source ${{ github.action_path }}/../retry-function.sh
         fetch_instances() {
             local list_response
             list_response=$(curl --fail-with-body -s -X GET \
@@ -77,7 +77,10 @@ runs:
             echo "$list_response"
         }
 
-        list_response=$(retry fetch_instances)
+        if ! list_response=$(retry fetch_instances); then
+          echo "Error: Failed to fetch instances after multiple retries."
+          exit 1
+        fi
 
         autoLoadPod="${AUTO_LOAD_POD:-${{ inputs.auto-load-pod }}}"
         extensionAutoInstall="${EXTENSION_AUTO_INSTALL:-${{ inputs.extension-auto-install }}}"
@@ -87,19 +90,27 @@ runs:
 
         delete_instance() {
             # We expect a 200 on success or 404 if it's already gone. Other codes are errors.
-            http_code=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE \
+            local http_code
+            http_code=$(curl --fail-with-body -s -o /dev/null -w "%{http_code}" -X DELETE \
                 -H "$AUTH_HEADER" \
                 -H "$CONTENT_TYPE_HEADER" \
                 "$API_URL_BASE/$previewName")
-            if [ "$http_code" -ne 200 ] && [ "$http_code" -ne 404 ]; then
-                echo "Error deleting instance, HTTP code: $http_code"
+            local exit_code=$?
+            if [ $exit_code -ne 0 ]; then
+                echo "Error deleting instance, curl failed with exit code $exit_code. API response: $http_code" >&2
                 return 1
             fi
+            if [ "$http_code" -eq 200 ]; then
+                echo "Instance '$previewName' deleted successfully."
+            fi
         }
 
         if [ -n "$instance_exists" ]; then
           echo "Found existing instance using '$previewName', trying to delete the old one..."
-          retry delete_instance
+          if ! retry delete_instance; then
+            echo "Error: Failed to delete existing instance after multiple retries."
+            exit 1
+          fi
         fi
 
         create_instance_func() {
@@ -116,7 +127,11 @@ runs:
         }
 
         echo "Creating preview environment ..."
-        response=$(retry create_instance_func)
+        if ! response=$(retry create_instance_func); then
+          echo "Error: Failed to create preview environment after multiple retries."
+          exit 1
+        fi
+        
         endpointUrl=$(echo "$response" | jq -r .endpoint_url)
 
         echo "Created preview environment with endpoint URL: $endpointUrl"
@@ -147,7 +162,7 @@ runs:
         CONTENT_TYPE_HEADER="content-type: application/json"
         API_URL_BASE="https://api.localstack.cloud/v1/compute/instances"
 
-        source ${{ github.action_path }}/retry-function.sh
+        source ${{ github.action_path }}/../retry-function.sh
         fetch_logs() {
             local log_response
             log_response=$(curl --fail-with-body -s -X GET \
@@ -175,8 +190,7 @@ runs:
             echo "$log_response"
         }
         echo "Fetching logs for $previewName ..."
-        log_response=$(retry fetch_logs)
-        if [ -z "$log_response" ]; then
+        if ! log_response=$(retry fetch_logs); then
           echo "Error: Failed to fetch logs after multiple retries."
           exit 1
         fi