spk onboard smoke test fails on storage account name (#213)

Author: edaena

tests/functions.sh

@@ -200,6 +200,27 @@ function storage_account_table_exists () {
 
     if [ "$sat_exists" = "true" ]; then
         echo "The table '$t' exists "
+        if [ "$action" == "delete" ]; then
+            echo "Delete table '$t'"
+            az storage table delete -n $t --account-name $sa_name
+            total_wait_seconds=20
+            wait_delete_seconds=50
+            start=0
+            wait_seconds=5
+            while [ $start -lt $total_wait_seconds ]; do
+                sat_result=$(az storage table exists -n $t --account-name $sa_name)
+                sat_exists=$(echo $sat_result | jq '.exists | . == true')
+                if [ "$sat_exists" = "false"  ]; then
+                    echo "The table '$t' was marked deleted"
+                    echo "Wait $wait_delete_seconds seconds for delete..."
+                    sleep $wait_delete_seconds
+                    break
+                fi
+                echo "Wait $wait_seconds seconds..."
+                sleep $wait_seconds
+                start=$((start + wait_seconds))
+            done
+        fi
      else
         echo "The table $sa_name does not exist"
         if [ "$action" == "fail" ]; then

tests/introspection-validations.sh

@@ -17,6 +17,7 @@ TEST_WORKSPACE="$(pwd)/spk-env"
 [ ! -z "$SP_APP_ID" ] || { echo "Provide SP_APP_ID"; exit 1;}
 [ ! -z "$SP_PASS" ] || { echo "Provide SP_PASS"; exit 1;}
 [ ! -z "$SP_TENANT" ] || { echo "Provide SP_TENANT"; exit 1;}
+[ ! -z "$AZ_STORAGE_ACCOUNT" ] || { echo "Provide AZ_STORAGE_ACCOUNT"; exit 1;}
 AZDO_ORG_URL="${AZDO_ORG_URL:-"https://dev.azure.com/$AZDO_ORG"}"
 
 echo "TEST_WORKSPACE: $TEST_WORKSPACE"
@@ -26,10 +27,10 @@ echo "AZDO_ORG: $AZDO_ORG"
 echo "AZDO_ORG_URL: $AZDO_ORG_URL"
 echo "AZ_RESOURCE_GROUP: $AZ_RESOURCE_GROUP"
 echo "ACR_NAME: $ACR_NAME"
+echo "AZ_STORAGE_ACCOUNT: $AZ_STORAGE_ACCOUNT"
 
 vg_name=fabrikam-vg
-sa_name=fabrikamsatst
-sat_name=fabrikamdeployments
+sat_name=fabrikamtestdeployments
 sa_location=westus
 kv_name=fabrikamkv
 kv_location=westus
@@ -40,9 +41,10 @@ echo "SPK Version: $(spk --version)"
 echo "Running from $(pwd)"
 
 # spk deployment onboard validation test
-storage_account_exists $sa_name $AZ_RESOURCE_GROUP "delete"
-spk deployment onboard -s $sa_name -t $sat_name -l $sa_location -r $AZ_RESOURCE_GROUP --subscription-id $AZ_SUBSCRIPTION_ID --service-principal-id $SP_APP_ID --service-principal-password $SP_PASS --tenant-id $SP_TENANT
-storage_account_exists $sa_name $AZ_RESOURCE_GROUP "fail"
-storage_account_table_exists $sat_name $sa_name "fail"
+storage_account_exists $AZ_STORAGE_ACCOUNT $AZ_RESOURCE_GROUP "fail"
+storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "delete"
+spk deployment onboard -s $AZ_STORAGE_ACCOUNT -t $sat_name -l $sa_location -r $AZ_RESOURCE_GROUP --subscription-id $AZ_SUBSCRIPTION_ID --service-principal-id $SP_APP_ID --service-principal-password $SP_PASS --tenant-id $SP_TENANT
+storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "fail"
+storage_account_table_exists $sat_name $AZ_STORAGE_ACCOUNT "delete"
 
 echo "Successfully reached the end of the introspection validations script."