Check env var is set before using

Author: Jarryd Tilbrook

commands/run.sh

@@ -309,11 +309,15 @@ if [[ -n "${BUILDKITE_AGENT_BINARY_PATH:-}" ]] ; then
     "-e" "BUILDKITE_JOB_ID"
     "-e" "BUILDKITE_BUILD_ID"
     "-e" "BUILDKITE_AGENT_ACCESS_TOKEN"
-    "-e" "BUILDKITE_AGENT_JOB_API_SOCKET"
-    "-e" "BUILDKITE_AGENT_JOB_API_TOKEN"
     "-v" "$BUILDKITE_AGENT_BINARY_PATH:/usr/bin/buildkite-agent"
-    "-v" "$BUILDKITE_AGENT_JOB_API_SOCKET:$BUILDKITE_AGENT_JOB_API_SOCKET"
   )
+  if [[ -n "${BUILDKITE_AGENT_JOB_API_SOCKET:-}" ]] ; then
+    run_params+=(
+      "-e" "BUILDKITE_AGENT_JOB_API_SOCKET"
+      "-e" "BUILDKITE_AGENT_JOB_API_TOKEN"
+      "-v" "$BUILDKITE_AGENT_JOB_API_SOCKET:$BUILDKITE_AGENT_JOB_API_SOCKET"
+    )
+  fi
 fi
 
 # Optionally expose service ports

tests/run.bats

@@ -870,7 +870,7 @@ cmd3"
 
   stub docker \
     "compose -f docker-compose.yml -p buildkite1111 up -d --scale myservice=0 myservice : echo ran myservice dependencies" \
-    "compose -f docker-compose.yml -p buildkite1111 run --name buildkite1111_myservice_build_1 -T --rm -e BUILDKITE_JOB_ID -e BUILDKITE_BUILD_ID -e BUILDKITE_AGENT_ACCESS_TOKEN -e BUILDKITE_AGENT_JOB_API_SOCKET -e BUILDKITE_AGENT_JOB_API_TOKEN -v $BATS_MOCK_TMPDIR/bin/buildkite-agent:/usr/bin/buildkite-agent -v $BUILDKITE_AGENT_JOB_API_SOCKET:$BATS_MOCK_TMPDIR/agent.sock myservice : echo ran myservice"
+    "compose -f docker-compose.yml -p buildkite1111 run --name buildkite1111_myservice_build_1 -T --rm -e BUILDKITE_JOB_ID -e BUILDKITE_BUILD_ID -e BUILDKITE_AGENT_ACCESS_TOKEN -v $BATS_MOCK_TMPDIR/bin/buildkite-agent:/usr/bin/buildkite-agent -e BUILDKITE_AGENT_JOB_API_SOCKET -e BUILDKITE_AGENT_JOB_API_TOKEN -v $BUILDKITE_AGENT_JOB_API_SOCKET:$BATS_MOCK_TMPDIR/agent.sock myservice : echo ran myservice"
 
   stub buildkite-agent \
     "meta-data exists docker-compose-plugin-built-image-tag-myservice : exit 1"
@@ -1220,7 +1220,7 @@ cmd3"
 
 @test "Run with --quiet-pull" {
   export BUILDKITE_COMMAND="echo hello world"
-  
+
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_RUN=myservice
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CHECK_LINKED_CONTAINERS=false
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_QUIET_PULL=true

tests/v1/run.bats

@@ -513,7 +513,7 @@ cmd3"
   assert_success
   assert_output --partial "Running /bin/sh -e -c 'pwd' in service myservice"
   assert_output --partial "ran myservice without pull"
-  
+
   unstub docker-compose
   unstub buildkite-agent
 }
@@ -949,11 +949,10 @@ cmd3"
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CHECK_LINKED_CONTAINERS=false
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CLEANUP=false
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_MOUNT_BUILDKITE_AGENT=true
-  export BUILDKITE_AGENT_JOB_API_SOCKET=$BATS_MOCK_TMPDIR/agent.sock
 
   stub docker-compose \
     "-f docker-compose.yml -p buildkite1111 up -d --scale myservice=0 myservice : echo ran myservice dependencies" \
-    "-f docker-compose.yml -p buildkite1111 run --name buildkite1111_myservice_build_1 -T --rm -e BUILDKITE_JOB_ID -e BUILDKITE_BUILD_ID -e BUILDKITE_AGENT_ACCESS_TOKEN -e BUILDKITE_AGENT_JOB_API_SOCKET -e BUILDKITE_AGENT_JOB_API_TOKEN -v $BATS_MOCK_TMPDIR/bin/buildkite-agent:/usr/bin/buildkite-agent -v $BUILDKITE_AGENT_JOB_API_SOCKET:$BATS_MOCK_TMPDIR/agent.sock myservice : echo ran myservice"
+    "-f docker-compose.yml -p buildkite1111 run --name buildkite1111_myservice_build_1 -T --rm -e BUILDKITE_JOB_ID -e BUILDKITE_BUILD_ID -e BUILDKITE_AGENT_ACCESS_TOKEN -v $BATS_MOCK_TMPDIR/bin/buildkite-agent:/usr/bin/buildkite-agent myservice : echo ran myservice"
 
   stub buildkite-agent \
     "meta-data exists docker-compose-plugin-built-image-tag-myservice : exit 1"
@@ -1247,7 +1246,7 @@ cmd3"
 
 @test "Run waiting for dependencies" {
   export BUILDKITE_COMMAND="echo hello world"
-  
+
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_RUN=myservice
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CHECK_LINKED_CONTAINERS=false
   export BUILDKITE_PLUGIN_DOCKER_COMPOSE_WAIT=true