From 346f8eef85834f204195322648e76410067cf5f8 Mon Sep 17 00:00:00 2001
From: Cecile Robert-Michon <cerobert@microsoft.com>
Date: Wed, 27 Feb 2019 09:39:59 -0800
Subject: [PATCH] ci: add storage account cleanup to VHD pipeline (#589)

---
 .pipelines/vhd-builder.yaml | 13 +++++++++++++
 packer.mk                   |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.pipelines/vhd-builder.yaml b/.pipelines/vhd-builder.yaml
index d042aaf547..5d3c195ee7 100644
--- a/.pipelines/vhd-builder.yaml
+++ b/.pipelines/vhd-builder.yaml
@@ -44,6 +44,19 @@ phases:
       -e VHD_NAME=${VHD_NAME} \
       ${DEIS_GO_DEV_IMAGE} make az-copy
     displayName: Copying resource to Classic Storage Account
+    condition: not(variables.DRY_RUN)
+  - script: |
+      SA_NAME="$(cat packer-output | grep "storage name:" | cut -d " " -f 3)" && \
+      docker run --rm \
+      -v ${PWD}:/go/src/github.com/Azure/aks-engine \
+      -w /go/src/github.com/Azure/aks-engine \
+      -e CLIENT_ID=${CLIENT_ID} \
+      -e CLIENT_SECRET="$(CLIENT_SECRET)" \
+      -e TENANT_ID=${TENANT_ID} \
+      -e SA_NAME=${SA_NAME} \
+      -e AZURE_RESOURCE_GROUP_NAME=${AZURE_RESOURCE_GROUP_NAME} \
+      ${DEIS_GO_DEV_IMAGE} make delete-sa
+    displayName: Clean-up Storage Account
   - script: |
       docker run --rm \
       -v ${PWD}:/go/src/github.com/Azure/aks-engine \
diff --git a/packer.mk b/packer.mk
index b32965e5d2..2681e41028 100644
--- a/packer.mk
+++ b/packer.mk
@@ -8,10 +8,13 @@ az-login:
 	az login --service-principal -u ${CLIENT_ID} -p ${CLIENT_SECRET} --tenant ${TENANT_ID}
 
 run-packer: az-login
-	@packer version && $(MAKE) init-packer && ($(MAKE) build-packer | tee packer-output)
+	@packer version && $(MAKE) init-packer | tee packer-output && ($(MAKE) build-packer | tee -a packer-output)
 
 az-copy: az-login
 	azcopy --source "${OS_DISK_SAS}" --destination "${CLASSIC_BLOB}/${VHD_NAME}" --dest-sas "${CLASSIC_SAS_TOKEN}"
 
+delete-sa: az-login
+	az storage account delete -n ${SA_NAME} -g ${AZURE_RESOURCE_GROUP_NAME} --yes
+
 generate-sas: az-login
 	az storage container generate-sas --name vhds --permissions lr --connection-string "${CLASSIC_SA_CONNECTION_STRING}" --start ${START_DATE} --expiry ${EXPIRY_DATE} | tr -d '"' | tee -a vhd-sas && cat vhd-sas
\ No newline at end of file