requested fixes from comments

dbradish-microsoft · Jul 3, 2019 · 0df1b61 · 0df1b61
1 parent 8ce4b47
commit 0df1b61
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 58 deletions.
diff --git a/cosmosdb/create-cosmosdb-account-database/create-cosmosdb-account-database.sh b/cosmosdb/create-cosmosdb-account-database/create-cosmosdb-account-database.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new SQL API account, database, and container
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 databaseName='myDatabase'
 containerName='myContainer'
 partitionKeyPath='/myPartitionKey' #property to partition data on

diff --git a/cosmosdb/create-cosmosdb-cassandra-account/create-cosmosdb-cassandra-account.sh b/cosmosdb/create-cosmosdb-cassandra-account/create-cosmosdb-cassandra-account.sh
@@ -2,13 +2,13 @@
 
 # NOTE: Support to provision Cassandra Tables is not supported at this time
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new Cassandra API account and keyspace
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 keyspaceName='myKeyspaceName'
 
 

diff --git a/cosmosdb/create-cosmosdb-gremlin-account/create-cosmosdb-gremlin-account.sh b/cosmosdb/create-cosmosdb-gremlin-account/create-cosmosdb-gremlin-account.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new account, database, and graph
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 databaseName='myDatabase'
 graphName='myGraph'
 partitionKeyPath='/myPartitionKey' #property to partition data on
@@ -43,4 +43,4 @@ az cosmosdb collection create \
 	--db-name $databaseName \
 	--resource-group $resourceGroupName \
     --partition-key-path $partitionKeyPath \
-    --throughput throughput
+    --throughput throughput
diff --git a/cosmosdb/create-cosmosdb-mongodb-account/create-cosmosdb-mongodb-account.sh b/cosmosdb/create-cosmosdb-mongodb-account/create-cosmosdb-mongodb-account.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new MongoDB API account and database
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 databaseName='myDatabase'
 collectionName='myCollection'
 partitionKeyPath='/myPartitionKey' #property to partition data on

diff --git a/cosmosdb/create-cosmosdb-table-account/create-cosmosdb-table-account.sh b/cosmosdb/create-cosmosdb-table-account/create-cosmosdb-table-account.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new Table API account, database, and table
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 databaseName='myDatabase'
 tableName='myTable'
 throughput=400
@@ -41,4 +41,4 @@ az cosmosdb collection create \
     --collection-name $tableName \
     --name $accountName \
     --db-name $databaseName \
-    --throughput $throughput
+    --throughput $throughput
diff --git a/...availability-cosmosdb-configure-failover/high-availability-cosmosdb-configure-failover.sh b/...availability-cosmosdb-configure-failover/high-availability-cosmosdb-configure-failover.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new SQL API account
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 
 
 # Create a resource group
@@ -28,4 +28,4 @@ az cosmosdb create \
 az cosmosdb update \
 	--name $accountName \
 	--resource-group $resourceGroupName \
-	--locations "South Central US"=0 "North Central US"=1 "East US 2"=2 "West US 2"=3
+	--locations "South Central US"=0 "North Central US"=1 "East US 2"=2 "West US 2"=3
diff --git a/cosmosdb/scale-cosmosdb-get-account-key/secure-cosmosdb-get-account-key.sh b/cosmosdb/scale-cosmosdb-get-account-key/secure-cosmosdb-get-account-key.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new SQL API account
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 
 
 # Create a resource group
@@ -27,4 +27,4 @@ az cosmosdb create \
 # List account keys
 az cosmosdb keys list \
 	--name $accountName \
-	--resource-group $resourceGroupName 
+	--resource-group $resourceGroupName
diff --git a/...db/scale-cosmosdb-replicate-multiple-regions/scale-cosmosdb-replicate-multiple-regions.sh b/...db/scale-cosmosdb-replicate-multiple-regions/scale-cosmosdb-replicate-multiple-regions.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new SQL API account
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
-
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 
 # Create a resource group
 az group create \

diff --git a/cosmosdb/scale-cosmosdb-throughput/scale-cosmosdb-throughput.sh b/cosmosdb/scale-cosmosdb-throughput/scale-cosmosdb-throughput.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new SQL API account, database, and container
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 databaseName='myDatabase'
 containerName='myContainer'
 partitionKeyPath='/myPartitionKey' #property to partition data on

diff --git a/cosmosdb/secure-cosmosdb-create-firewall/secure-cosmosdb-create-firewall.sh b/cosmosdb/secure-cosmosdb-create-firewall/secure-cosmosdb-create-firewall.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new SQL API account, database, and container
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 ipRangeFilter="13.91.6.132,13.91.6.1/24"
 
 

diff --git a/cosmosdb/secure-cosmosdb-get-connection-string/secure-cosmosdb-get-connection-string b/cosmosdb/secure-cosmosdb-get-connection-string/secure-cosmosdb-get-connection-string
@@ -1,13 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new SQL API account, database, and container
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
-
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 
 # Create a resource group
 az group create \

diff --git a/...e-cosmosdb-get-mongodb-connection-string/secure-cosmosdb-get-mongodb-connection-string.sh b/...e-cosmosdb-get-mongodb-connection-string/secure-cosmosdb-get-mongodb-connection-string.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new MongoDB API account
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 
 
 # Create a resource group

diff --git a/cosmosdb/secure-cosmosdb-regenerate-keys/secure-cosmosdb-regenerate-keys.sh b/cosmosdb/secure-cosmosdb-regenerate-keys/secure-cosmosdb-regenerate-keys.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Generate a unique 16 character alphanumeric string to ensure unique resource names
-uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 16 | head -n 1)
+# Generate a unique 10 character alphanumeric string to ensure unique resource names
+uniqueId=$(env LC_CTYPE=C tr -dc 'a-z0-9' < /dev/urandom | fold -w 10 | head -n 1)
 
 # Set variables for the new SQL API account, database, and container
-resourceGroupName='myResourceGroup-'$uniqueId
+resourceGroupName='myResourceGroup'
 location='southcentralus'
-accountName='mycosmosaccount-'$uniqueId #needs to be lower case
+accountName="mycosmosaccount-$uniqueId" #needs to be lower case
 
 
 # Create a resource group