Merge pull request #8 from Frozen-Tapestry/develop

Escape spaces within args

.github/workflows/verify.yml

@@ -25,7 +25,11 @@ jobs:
           ARG MY_ENV_VAR2
           ENV MY_ENV_VAR=$MY_ENV_VAR
           ENV MY_ENV_VAR2=$MY_ENV_VAR2
-          CMD ["sh", "-c", "echo Result: $MY_ENV_VAR $MY_ENV_VAR2"]' > Dockerfile
+          ARG EXTRA_ENV_VAR
+          ARG EXTRA_ENV_VAR2
+          ENV EXTRA_ENV_VAR=$EXTRA_ENV_VAR
+          ENV EXTRA_ENV_VAR2=$EXTRA_ENV_VAR2
+          CMD ["sh", "-c", "echo Result: $MY_ENV_VAR $MY_ENV_VAR2 ~$EXTRA_ENV_VAR~ ~$EXTRA_ENV_VAR2~"]' > Dockerfile
           cat Dockerfile
       - name: Use Build and Push action
         uses: ./
@@ -36,6 +40,7 @@ jobs:
           tags: ghcr.io/frozen-tapestry/podman-action-verify:latest
           dockerfile: Dockerfile
           build_args: MY_ENV_VAR=Test MY_ENV_VAR2=Test2
+          extra_args: --build-arg EXTRA_ENV_VAR="Extra\ env\ 1" --build-arg=EXTRA_ENV_VAR2=Extra\ env\ 2
           security: |
             --security-opt=seccomp=unconfined
             --security-opt=apparmor=unconfined
@@ -46,7 +51,7 @@ jobs:
           OUTPUT=$(docker run --rm ghcr.io/frozen-tapestry/podman-action-verify:latest)
           echo "Container Output: $OUTPUT"
           
-          if [ "$OUTPUT" != "Result: Test Test2" ]; then
+          if [ "$OUTPUT" != "Result: Test Test2 ~\"Extra env 1\"~ ~Extra env 2~" ]; then
             echo "Output does not match expected string"
             exit 1
           fi

RELEASES.md

@@ -7,4 +7,8 @@
 ### v1.1.0
 
 - Permission error fix
-- Readme updates
+- Readme updates
+
+### v1.2.0
+
+- Added support for escaped spaces

action.yml

@@ -25,13 +25,13 @@ inputs:
     required: false
   build_args:
     description: |
-      Optional build arguments. Space-separated. e.g.
+      Optional build arguments. Space-separated, escape space if used within single arg. e.g.
       MY_ENV_VAR=Test MY_ENV_VAR2=Test2
     required: false
   extra_args:
     description: |
-      Extra args to be passed to podman. Space-separated. e.g.
-      -e=MY_ENV=Test -e=MY_ENV=Test2
+      Extra args to be passed to podman. Space-separated, escape space if used within single arg. e.g.
+      -e=MY_ENV=Test -e=MY_ENV=Test2 -e MY_ENV=Var\ with\ spaces
     required: false
   dockerfile:
     description: Path to the Dockerfile. If set, build step is performed.

scripts/run.sh

@@ -32,16 +32,29 @@ if [[ -n "$REGISTRY" && -n "$USERNAME" && -n "$PASSWORD" ]]; then
   run_cmd "${build_cmd[@]}"
 fi
 
+# Function that splits on unescaped spaces (but not on escaped ones)
+# and outputs each processed token on a new line.
 generate_args() {
   local input_args="$1"
   local prefix="$2"
-  local output=""
+  local output=()
+  local placeholder="__ESCAPED_SPACE__"
 
   if [[ -n "$input_args" ]]; then
-    output="$(echo "$input_args" | tr -s ' ' '\n' | sed "s/[^ ]* */$prefix&/g")"
+    # Replace escaped spaces (\ ) with a unique placeholder.
+    local temp="${input_args//\\ /$placeholder}"
+    # Split on spaces (escaped ones are now hidden).
+    IFS=' ' read -r -a parts <<< "$temp"
+    for part in "${parts[@]}"; do
+      # Skip any empty parts.
+      [[ -z "$part" ]] && continue
+      # Restore escaped spaces.
+      part="${part//$placeholder/ }"
+      output+=("$prefix$part")
+    done
   fi
 
-  echo "$output"
+  printf "%s\n" "${output[@]}"
 }
 
 ### BUILD
@@ -53,13 +66,13 @@ if [[ -n "$DOCKERFILE" ]]; then
   echo "Main labels: $CREATED $REVISION $SOURCE"
 
   TAGS=$(generate_args "$ACTION_TAGS" "-t=")
-  echo "Tags: $TAGS"
+  echo "Tags: ${TAGS[@]}"
   LABELS=$(generate_args "$ACTION_LABELS" "--label=")
-  echo "Labels: $LABELS"
+  echo "Labels: ${LABELS[@]}"
   BUILD_ARGS=$(generate_args "$ACTION_BUILD_ARGS" "--build-arg=")
-  echo "Build args: $BUILD_ARGS"
+  echo "Build args: ${BUILD_ARGS[@]}"
   EXTRA_ARGS=$(generate_args "$ACTION_EXTRA_ARGS" "")
-  echo "Extra args: $EXTRA_ARGS"
+  echo "Extra args: ${EXTRA_ARGS[@]}"
 
   build_cmd=(podman build
     --platform="linux/amd64"
@@ -81,11 +94,12 @@ fi
 
 if [[ -n "$PUSH" && "$PUSH" == "true" ]]; then
   TAGS=$(generate_args "$ACTION_TAGS" "")
-  echo "Tags: $TAGS"
+  echo "Tags: ${TAGS[@]}"
 
   build_cmd=(podman push
     --storage-driver=overlay
-    --authfile="$REGISTRY_AUTH_FILE" $TAGS
+    --authfile="$REGISTRY_AUTH_FILE"
+    $TAGS
   )
   run_cmd "${build_cmd[@]}"
 fi