Skip to content

Commit 4c60369

Browse files
author
Nicolas Huray
committed
Fix bug in deployment overview display
1 parent be5fb81 commit 4c60369

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

run.sh

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -342,35 +342,39 @@ if [ 'true' = "$DEPLOYMENT_OVERVIEW" ]; then
342342
while :
343343
do
344344
sleep 5
345-
DEPLOYMENT_GET_OUTPUT=$($DEPLOYMENT_GET 2>&1)
345+
DEPLOYMENT_GET_OUTPUT=$($DEPLOYMENT_GET 2>&1 > /tmp/$DEPLOYMENT_ID)
346346
if [ $? -ne 0 ]; then
347+
printf "\n"
347348
warn "$DEPLOYMENT_OUTPUT"
348349
error "Deployment of application '$APPLICATION_NAME' on deployment group '$DEPLOYMENT_GROUP' failed"
349350
exit 1
350351
fi
351352

352353
# Deployment Status
353-
STATUS=$(echo $DEPLOYMENT_GET_OUTPUT | jsonValue 'status' | tr -d '\r\n' | tr -d ' ')
354-
ERROR_MESSAGE=$(echo $DEPLOYMENT_GET_OUTPUT | jsonValue 'message')
354+
STATUS=$(cat /tmp/$DEPLOYMENT_ID | jsonValue 'status' | tr -d '\r\n' | tr -d ' ')
355+
ERROR_MESSAGE=$(cat /tmp/$DEPLOYMENT_ID | jsonValue 'message')
355356

356357
# Deployment failed
357358
if [ "$STATUS" = 'Failed' ]; then
359+
printf "\n"
358360
error "Deployment of application '$APPLICATION_NAME' on deployment group '$DEPLOYMENT_GROUP' failed: $ERROR_MESSAGE"
359361
exit 1
360362
fi
363+
364+
# Deployment Overview
365+
IN_PROGRESS=$(cat /tmp/$DEPLOYMENT_ID | jsonValue 'InProgress' | tr -d '\r\n' | tr -d ' ')
366+
PENDING=$(cat /tmp/$DEPLOYMENT_ID | jsonValue 'Pending' | tr -d '\r\n' | tr -d ' ')
367+
SKIPPED=$(cat /tmp/$DEPLOYMENT_ID | jsonValue 'Skipped' | tr -d '\r\n' | tr -d ' ')
368+
SUCCEEDED=$(cat /tmp/$DEPLOYMENT_ID | jsonValue 'Succeeded' | tr -d '\r\n' | tr -d ' ')
369+
FAILED=$(cat /tmp/$DEPLOYMENT_ID | jsonValue 'Failed' | tr -d '\r\n' | tr -d ' ')
370+
printf "\r| In Progress: $IN_PROGRESS | Pending: $PENDING | Skipped: $SKIPPED | Succeeded: $SUCCEEDED | Failed: $FAILED |"
371+
361372
# Deployment succeeded
362373
if [ "$STATUS" = 'Succeeded' ]; then
374+
printf "\n"
363375
success "Deployment of application '$APPLICATION_NAME' on deployment group '$DEPLOYMENT_GROUP' succeeded"
364376
break
365377
fi
366-
367-
# Deployment Overview
368-
IN_PROGRESS=$(echo $DEPLOYMENT_GET_OUTPUT | jsonValue 'InProgress' | tr -d '\r\n' | tr -d ' ')
369-
PENDING=$(echo $DEPLOYMENT_GET_OUTPUT | jsonValue 'Pending' | tr -d '\r\n' | tr -d ' ')
370-
SKIPPED=$(echo $DEPLOYMENT_GET_OUTPUT | jsonValue 'Skipped' | tr -d '\r\n' | tr -d ' ')
371-
SUCCEEDED=$(echo $DEPLOYMENT_GET_OUTPUT | jsonValue 'Succeeded' | tr -d '\r\n' | tr -d ' ')
372-
FAILED=$(echo $DEPLOYMENT_GET_OUTPUT | jsonValue 'Failed' | tr -d '\r\n' | tr -d ' ')
373-
echo "| In Progress: $IN_PROGRESS | Pending: $PENDING | Skipped: $SKIPPED | Succeeded: $SUCCEEDED | Failed: $FAILED |"
374378
done
375379
else
376380
info "Deployment of application '$APPLICATION_NAME' on deployment group '$DEPLOYMENT_GROUP' in progress"

wercker-step.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: aws-code-deploy
2-
version: 0.0.23
2+
version: 0.0.24
33
description: Deploy applications with AWS Code Deploy
44
keywords:
55
- aws

0 commit comments

Comments
 (0)