renamed to QuickStart, added support for new SKU, changed offerid

Author: vjirovsky-pure

.gitignore

@@ -1,3 +1,4 @@
 tmp*.json
 *.bicepparam
 e2e-demo-params.sh
+quickstart-params.sh

00-setup-machine.sh

@@ -95,7 +95,7 @@ echo "Asking user to log in...";
 az login
 if [ $? == 0 ]; then
   echosuccess "
-  Your machine should be ready! Now proceed with './deploy-e2e-demo.sh' or './01-deploy-prerequisities.sh' script
+  Your machine should be ready! Now proceed with './deploy-quickstart.sh' or './01-deploy-prerequisities.sh' script
   
   ";
 else

README.md

@@ -8,7 +8,7 @@ The Bicep framework for CBS deployment comes with Bicep templates and bash scrip
 
 - **Module #03 (Test VM)** -  This module provisions a test Virtual Machine (VM) of Windows Server 2019 with pre-installed MS SQL server and configures test volumes in CBS instance to mount them via iSCSI protocol.
 
-- **Module #04 (E2E Demo Deployment) 🧪** - For hands-on/testing purposes, this module combines all modules #01-#03 (described above) and deploys all required resources, CBS Managed App and a test Virtual Machine in the single deployment script.
+- **Module #04 (QuickStart Demo Deployment) 🧪** - For hands-on/testing purposes, this module combines all modules #01-#03 (described above) and deploys all required resources, CBS Managed App and a test Virtual Machine in the single deployment script.
 
 ## Prerequisites
 - bash
@@ -42,7 +42,7 @@ You can also run all commands in this repo on your computer or in container usin
 
 1. Add permissions to execute scripts:
     ```bash
-    $ chmod +x 00-setup-machine.sh 01-deploy-prerequisities.sh 02-deploy-cbs.sh 03-deploy-test-vm.sh deploy-e2e-demo.sh
+    $ chmod +x 00-setup-machine.sh 01-deploy-prerequisities.sh 02-deploy-cbs.sh 03-deploy-test-vm.sh deploy-quickstart.sh
     ```
 1. Run the `00-setup-machine.sh` script to install all required tooling and log into Azure.
     ```bash
@@ -151,33 +151,30 @@ Password: *pureuser*
 
 <br><br>
 
-### Module #04 - E2E DEMO Deployment
+### Module #04 - QuickStart DEMO Deployment
 
-This repository contains a script `deploy-e2e-demo.sh` that combines all modules in the repository and enables easy testing and hands-on experience of the CBS (Pure Cloud Block Store) on Azure. 
+This repository contains a script `deploy-quickstart.sh` that combines all modules in the repository and enables easy testing and hands-on experience of the CBS (Pure Cloud Block Store) on Azure. 
 With just one script, you can quickly set up and run a test environment to explore the features and capabilities of the CBS.
 
 The script includes all required CBS resources and sets up a test Windows SQL Server VM with mounted CBS volumes via iSCSI.
 
-![Deployed resources with deploy-e2e-demo.sh script](./static/deployed-resources.png)
+![Deployed resources with deploy-quickstart.sh script](./static/deployed-resources.png)
 
 To use this script:
-1. rename the file `e2e-demo-params.sh.example` to `e2e-demo-params.sh` 
+
+1. rename the file `quickstart-params.sh.example` to `quickstart-params.sh`:
     ```bash
-    $ mv e2e-demo-params.sh.example e2e-demo-params.sh
+    $ mv quickstart-params.sh.example quickstart-params.sh
     ```
-1. enter the necessary values into the `e2e-demo-params.sh` file
-1. execute the script 
+1. enter the necessary values into the `quickstart-params.sh` file
+1. execute the script:
     ```bash
-    $ ./deploy-e2e-demo.sh
+    $ ./deploy-quickstart.sh
     ```
 
-
-
-
 ## Limitations / Troubleshooting
 
-
-### Common Deployment vNET 
+### Common Deployment vNET
 
 The prerequisites (Module #01) only supports a single virtual network scenario where all required subnets are deployed within one common vNET, as this is considered best practice. The use of multiple vNETs that are peered with each other is not supported by this framework.
 

deploy-e2e-demo.sh deploy-quickstart.shdeploy-e2e-demo.sh renamed to deploy-quickstart.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 SHOW_DEBUG_OUTPUT=false
-source $(dirname $0)/e2e-demo-params.sh
+source $(dirname $0)/quickstart-params.sh
 
 source $(dirname $0)/script-modules/common.sh
 
@@ -10,7 +10,7 @@ source $(dirname $0)/script-modules/ascii-logo.sh
 
 echo -e "
 ------------------------------------------------------------
-        Pure Cloud Block Store - E2E DEMO Deployment
+        Pure Cloud Block Store - QuickStart DEMO Deployment
                 (c) 2023 Pure Storage
                         v$CLI_VERSION
 ------------------------------------------------------------
@@ -32,7 +32,7 @@ Location: $location
 
 # Deploy our infrastructure
 output=$(az deployment sub create \
-  --name "CBS-E2E-deploy-prereq-bicep-sh" \
+  --name "CBS-E2E-$location-deploy-prereq-bicep-sh" \
   --location $location \
   --subscription $subscriptionId \
   --template-file "templates/prerequisites.bicep" \
@@ -102,7 +102,7 @@ echo -e "${C_BLUE3}${C_GREY85}
 "
 
 #in E2E demo we use the latest version
-latestPlan=`(echo '{"plans":[';curl 'https://catalogapi.azure.com/offers/purestoragemarketplaceadmin.pure_storage_cloud_block_store_deployment?api-version=2018-08-01-beta&market=US&includeStopSoldPlans=true&x-ms-effective-locale=en.en-us' 2> /dev/null  | jq -c '.plans | to_entries | .[] | select(.value.isStopSell == false) | select(.value.isHidden == false) | [.value.planId,.value.displayName, (.value.artifacts | .[] | select(.name == "DefaultTemplate").uri)]' | while IFS=$"\n" read -r line; do let "i=i+1";[[ $i == 1 ]] && add="" || add=","; echo $add;planId=\`echo $line | jq -r '.[0]'\`;displayName=\`echo $line | jq -r '.[1]'\`;uri=\`echo $line | jq -r '.[2]'\`;planVersion=\`curl "$uri" 2>/dev/null | jq -r '.resources | .[] | select(.type == "Microsoft.Solutions/applications").plan.version'\`;echo "{\"planId\":\"$planId\",\"planDisplayName\":\"$displayName\",\"planVersion\":\"$planVersion\"}";done;echo "]}") | jq '(.plans | sort_by(.planId) | reverse)[0]'`
+latestPlan=`(echo '{"plans":[';curl 'https://catalogapi.azure.com/offers/purestoragemarketplaceadmin.pure_cloud_block_store_product_deployment?api-version=2018-08-01-beta&market=US&includeStopSoldPlans=true&x-ms-effective-locale=en.en-us' 2> /dev/null  | jq -c '.plans | to_entries | .[] | select(.value.isStopSell == false) | select(.value.isHidden == false) | [.value.planId,.value.displayName, (.value.artifacts | .[] | select(.name == "DefaultTemplate").uri)]' | while IFS=$"\n" read -r line; do let "i=i+1";[[ $i == 1 ]] && add="" || add=","; echo $add;planId=\`echo $line | jq -r '.[0]'\`;displayName=\`echo $line | jq -r '.[1]'\`;uri=\`echo $line | jq -r '.[2]'\`;planVersion=\`curl "$uri" 2>/dev/null | jq -r '.resources | .[] | select(.type == "Microsoft.Solutions/applications").plan.version'\`;echo "{\"planId\":\"$planId\",\"planDisplayName\":\"$displayName\",\"planVersion\":\"$planVersion\"}";done;echo "]}") | jq '(.plans | sort_by(.planId) | reverse)[0]'`
 
 
 AZURE_MARKETPLACE_PLAN_NAME=`echo $latestPlan | jq -r .planId`
@@ -136,7 +136,7 @@ jitApprovers="[{'displayName':'$AZURE_LOGGED_USER_EMAIL','id':'$AZURE_LOGGED_USE
 
 # Deploy CBS
 output=$(az deployment group create \
-  --name "CBS-E2E-deploy-sh" \
+  --name "CBS-E2E-$location-deploy-sh" \
   --resource-group $resourceGroupName \
   --subscription $subscriptionId \
   --template-file "templates/cbs-managed-app.bicep" \
@@ -228,7 +228,7 @@ echo -e "${C_BLUE3}${C_GREY85}
 
 # Deploy our infrastructure
 output=$(az deployment group create \
-  --name "CBS-E2E-test-vm-deploy-sh" \
+  --name "CBS-E2E-$location-test-vm-deploy-sh" \
   --resource-group $resourceGroupName \
   --subscription $subscriptionId \
   --template-file "templates/test-vm.bicep" \

e2e-demo-params.sh.example quickstart-params.sh.examplee2e-demo-params.sh.example renamed to quickstart-params.sh.example

@@ -5,7 +5,7 @@ location='<< location >>'
 subscriptionId='<< subscription ID >>'
 
 # resource group (RG) where the all resources will be deployed
-resourceGroupName="test-cbs-e2e-"`date '+%F-%H-%M-%S'`"-rg"
+resourceGroupName="test-cbs-qs-"`date '+%F-%H-%M-%S'`"-rg"
 
 # the availability zone (AZ) for VMs inside CBS, e.g. 1
 # check support article if given AZ is currently supported within region

script-modules/common.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CLI_VERSION='1.0.5'
+CLI_VERSION='1.1.0'
 
 
 # terminal colors

templates/cbs-managed-app.bicep

@@ -33,7 +33,7 @@ param alertRecipients string
 @description('CBS array name in Purity')
 param arrayName string
 
-@allowed(['V10MUR1', 'V20MUR1', 'V20MP2R2'])
+@allowed(['V10MUR1', 'V10MP2R2', 'V20MUR1', 'V20MP2R2'])
 param cbsModelSku string
 
 @allowed([1,2,3])
@@ -103,7 +103,7 @@ param azureMarketPlacePlanPublisher string = 'purestoragemarketplaceadmin'
 param azureMarketPlacePlanVersion string = '1.0.3'
 param azureMarketPlacePlanName string = 'cbs_azure_6_4_10'
 
-param azureMarketPlacePlanOffer string = 'pure_storage_cloud_block_store_deployment'
+param azureMarketPlacePlanOffer string = 'pure_cloud_block_store_product_deployment'
 
 @description('''
 This access will not be used, but enabling JIT increases security - with turned on, Azure will not provide any default access to CBS resources (Managed App) to service provider.

templates/modules/cbs-vnet.bicep

@@ -68,6 +68,9 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
             {
               service: 'Microsoft.KeyVault'
             }
+            {
+              service: 'Microsoft.Storage'
+            }
           ]
           natGateway: {
             id: natgateway.id

templates/prerequisites.bicep

@@ -66,7 +66,7 @@ module vnetMngmtCustomRbacRole 'modules/custom-role.bicep' = {
   name: 'vnetMngmtCustomRbacRoleDeploy'
   params: {
     actions: [
-      'Microsoft.Network/virtualNetworks/subnets/joinViaServiceEndpoint/action'
+      'Microsoft.Network/virtualNetworks/subnets/joinViaServiceEndpoint/action', 'Microsoft.Network/virtualNetworks/subnets/join/action'
     ]
     roleName: variables.outputs.vnetMngmtCustomRbacRoleName
     roleDescription: 'Used for deployment of Pure CBS into vNET'