Use "playground_$USER" instead of random names

vdesabou · Mar 7, 2020 · c99380b · c99380b
1 parent f7a1c0b
commit c99380b
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 20 deletions.
diff --git a/connect/connect-azure-blob-storage-sink/README.md b/connect/connect-azure-blob-storage-sink/README.md
@@ -28,10 +28,10 @@ az login
 All the blob storage setup is automated:
 
 ```bash
-AZURE_RANDOM=$RANDOM
-AZURE_RESOURCE_GROUP=delete$AZURE_RANDOM
-AZURE_ACCOUNT_NAME=delete$AZURE_RANDOM
-AZURE_CONTAINER_NAME=delete$AZURE_RANDOM
+
+AZURE_RESOURCE_GROUP=playground_$USER
+AZURE_ACCOUNT_NAME=playground_$USER
+AZURE_CONTAINER_NAME=playground_$USER
 AZURE_REGION=westeurope
 
 az group create \

diff --git a/connect/connect-azure-blob-storage-sink/azure-blob-storage.sh b/connect/connect-azure-blob-storage-sink/azure-blob-storage.sh
@@ -16,12 +16,16 @@ else
     az login
 fi
 
-AZURE_RANDOM=$RANDOM
-AZURE_RESOURCE_GROUP=delete$AZURE_RANDOM
-AZURE_ACCOUNT_NAME=delete$AZURE_RANDOM
-AZURE_CONTAINER_NAME=delete$AZURE_RANDOM
+
+AZURE_RESOURCE_GROUP=playground_$USER
+AZURE_ACCOUNT_NAME=playground_$USER
+AZURE_CONTAINER_NAME=playground_$USER
 AZURE_REGION=westeurope
 
+set +e
+az group delete --name $AZURE_RESOURCE_GROUP --yes
+set -e
+
 az group create \
     --name $AZURE_RESOURCE_GROUP \
     --location $AZURE_REGION

diff --git a/connect/connect-azure-data-lake-storage-gen1-sink/azure-data-lake-storage-gen1.sh b/connect/connect-azure-data-lake-storage-gen1-sink/azure-data-lake-storage-gen1.sh
@@ -16,12 +16,17 @@ else
     az login
 fi
 
-AZURE_RANDOM=$RANDOM
-AZURE_RESOURCE_GROUP=delete$AZURE_RANDOM
-AZURE_DATALAKE_ACCOUNT_NAME=delete$AZURE_RANDOM
-AZURE_AD_APP_NAME=delete$AZURE_RANDOM
+
+AZURE_RESOURCE_GROUP=playground_$USER
+AZURE_DATALAKE_ACCOUNT_NAME=playground_$USER
+AZURE_AD_APP_NAME=playground_$USER
 AZURE_REGION=westeurope
 
+set +e
+az group delete --name $AZURE_RESOURCE_GROUP --yes
+az ad sp delete --id $AZURE_DATALAKE_CLIENT_ID
+set -e
+
 log "Creating resource $AZURE_RESOURCE_GROUP in $AZURE_REGION"
 az group create \
     --name $AZURE_RESOURCE_GROUP \

diff --git a/connect/connect-azure-data-lake-storage-gen2-sink/azure-data-lake-storage-gen2-2way-ssl.sh b/connect/connect-azure-data-lake-storage-gen2-sink/azure-data-lake-storage-gen2-2way-ssl.sh
@@ -16,12 +16,17 @@ else
     az login
 fi
 
-AZURE_RANDOM=$RANDOM
-AZURE_RESOURCE_GROUP=delete$AZURE_RANDOM
-AZURE_DATALAKE_ACCOUNT_NAME=delete$AZURE_RANDOM
-AZURE_AD_APP_NAME=delete$AZURE_RANDOM
+
+AZURE_RESOURCE_GROUP=playground_$USER
+AZURE_DATALAKE_ACCOUNT_NAME=playground_$USER
+AZURE_AD_APP_NAME=playground_$USER
 AZURE_REGION=westeurope
 
+set +e
+az group delete --name $AZURE_RESOURCE_GROUP --yes
+az ad sp delete --id $AZURE_DATALAKE_CLIENT_ID
+set -e
+
 log "Add the CLI extension for Azure Data Lake Gen 2"
 az extension add --name storage-preview
 

diff --git a/connect/connect-azure-data-lake-storage-gen2-sink/azure-data-lake-storage-gen2.sh b/connect/connect-azure-data-lake-storage-gen2-sink/azure-data-lake-storage-gen2.sh
@@ -16,12 +16,17 @@ else
     az login
 fi
 
-AZURE_RANDOM=$RANDOM
-AZURE_RESOURCE_GROUP=delete$AZURE_RANDOM
-AZURE_DATALAKE_ACCOUNT_NAME=delete$AZURE_RANDOM
-AZURE_AD_APP_NAME=delete$AZURE_RANDOM
+
+AZURE_RESOURCE_GROUP=playground_$USER
+AZURE_DATALAKE_ACCOUNT_NAME=playground_$USER
+AZURE_AD_APP_NAME=playground_$USER
 AZURE_REGION=westeurope
 
+set +e
+az group delete --name $AZURE_RESOURCE_GROUP --yes
+az ad sp delete --id $AZURE_DATALAKE_CLIENT_ID
+set -e
+
 log "Add the CLI extension for Azure Data Lake Gen 2"
 az extension add --name storage-preview