Added better resume support, exact line number for errors, updated default machine size

Author: mitchcapper

README.md

@@ -80,7 +80,9 @@ Create a new resource, search for the prebuilt image noted above.  You do not ne
 I suggest auto-shutdown to make sure you don't leave it running.
 
 #### Azure Auto Create Scripts
-If you have an azure account already created you can use the az_create.ps1 script to automatically setup the VM for you.  It will create everything under a new "CEFTest" resource group to make cleanup at the end easy. You can adjust the settings at the top if desired but really the only important options you pass as options to it.  It will setup the VM and enable remote powershell to make the process very easy. Just launch powershell (or type powershell into the run box in windows).  If the first time using powershell with azure you will need to install the tools for azure: ```Install-Module -Name AzureRM -Scope CurrentUser```.  Next change to the folder with all the CefSharpDockerfiles (cd c:\downloads\CefSharpDockerfiles for example).
+If you have an azure account already created you can use the az_create.ps1 script to automatically setup the VM for you.  It will create a Standard_F32s_v2	VM by default but this is 32 cpu's.  New Azure accounts need to file a support request to increase CPU quota beyond 10.  These are often approved within minutes but if you don't want to do so you can edit az_create.ps1 and change the size to something like a Standard_F8s_v2. It will take longer to build but your cost will be roughly the same total cost.
+
+It will create everything under a new "CEFTest" resource group to make cleanup at the end easy. You can adjust the settings at the top if desired but really the only important options you pass as options to it.  It will setup the VM and enable remote powershell to make the process very easy. Just launch powershell (or type powershell into the run box in windows).  If the first time using powershell with azure you will need to install the tools for azure: ```Install-Module -Name AzureRM -Scope CurrentUser```.  Next change to the folder with all the CefSharpDockerfiles (cd c:\downloads\CefSharpDockerfiles for example).
 
 Login with your azure credentials first:
 ```Connect-AzureRmAccount```

az_create.ps1

@@ -1,20 +1,31 @@
 [CmdletBinding()]
 Param(
 	[Parameter(Mandatory=$true)]
-	[String] $admin_creds,
+	[PSCredential] $admin_creds,
 	[String] $shutdown_email
 )	
 Set-StrictMode -version latest
 $ErrorActionPreference = "Stop";
-
 $VAULT_NAME = "CEFVault"
 $RESOURCE_GROUP = "CEFTest"
 $LOCATION="West US 2"
-$MACHINE_SIZE="Standard_F2s_v2"
+$MACHINE_SIZE="Standard_F32s_v2"
 $SECRET_NAME="CEFPSCertSecret"
 $CERT_PASS="dummy"
 $SHUTDOWN_TIME="23:30";
 $SHUTDOWN_TIMEZONE="Pacific Standard Time";
+Function WriteException($exp){
+	write-host "Caught an exception:" -ForegroundColor Yellow -NoNewline
+	write-host " $($exp.Exception.Message)" -ForegroundColor Red
+	write-host "`tException Type: $($exp.Exception.GetType().FullName)"
+	$stack = $exp.ScriptStackTrace;
+	$stack = $stack.replace("`n","`n`t")
+	write-host "`tStack Trace: $stack"
+}
+
+try{
+
+
 $CERT_PASS_SEC=ConvertTo-SecureString -AsPlainText -Force $CERT_PASS
 $cred = $admin_creds
 #Connect-AzureRmAccount
@@ -29,41 +40,52 @@ if(!$resourceGroup)
         $LOCATION = Read-Host "resourceGroupLocation";
     }
     Write-Host "Creating resource group '$RESOURCE_GROUP' in location '$LOCATION'";
-    New-AzureRmResourceGroup -Name $RESOURCE_GROUP -Location $LOCATION
+    New-AzureRmResourceGroup -Name $RESOURCE_GROUP -Location $LOCATION | Out-Null;
 }
 else{
     Write-Host "Using existing resource group '$RESOURCE_GROUP'";
 }
 
-Write-Host "Creating key vault to store remote powershell certificate in"
-New-AzureRmKeyVault -VaultName $VAULT_NAME -ResourceGroupName $RESOURCE_GROUP -Location $LOCATION -EnabledForDeployment -EnabledForTemplateDeployment | Out-Null
-$vault = Get-AzureRmKeyVault -VaultName $VAULT_NAME
+
+$vault = Get-AzureRmKeyVault -VaultName $VAULT_NAME -ErrorAction SilentlyContinue
+if (! $vault){
+	Write-Host "Creating key vault to store remote powershell certificate in"
+	New-AzureRmKeyVault -VaultName $VAULT_NAME -ResourceGroupName $RESOURCE_GROUP -Location $LOCATION -EnabledForDeployment -EnabledForTemplateDeployment | Out-Null
+	$vault = Get-AzureRmKeyVault -VaultName $VAULT_NAME
+}else{
+	Write-Host "Vault already exists not re-creating"
+}
 $certificateName = "CEFRemoteCert"
-Write-Host "Creating remote PS certificate"
-$thumbprint = (New-SelfSignedCertificate -DnsName $certificateName -CertStoreLocation Cert:\CurrentUser\My -KeySpec KeyExchange).Thumbprint
-$cert = (Get-ChildItem -Path cert:\CurrentUser\My\$thumbprint)
-$fileName = ".\$certificateName.pfx"
+$secretURL = (Get-AzureKeyVaultSecret -VaultName $VAULT_NAME -Name $SECRET_NAME  -ErrorAction SilentlyContinue)
+if (! $secretURL){
+	Write-Host "Creating remote PS certificate"
+	$thumbprint = (New-SelfSignedCertificate -DnsName $certificateName -CertStoreLocation Cert:\CurrentUser\My -KeySpec KeyExchange).Thumbprint
+	$cert = (Get-ChildItem -Path cert:\CurrentUser\My\$thumbprint)
+	$fileName = ".\$certificateName.pfx"
 
-Export-PfxCertificate -Cert $cert -FilePath $fileName -Password $CERT_PASS_SEC
-$fileContentBytes = Get-Content $fileName -Encoding Byte
-$fileContentEncoded = [System.Convert]::ToBase64String($fileContentBytes)
+	Export-PfxCertificate -Cert $cert -FilePath $fileName -Password $CERT_PASS_SEC
+	$fileContentBytes = Get-Content $fileName -Encoding Byte
+	$fileContentEncoded = [System.Convert]::ToBase64String($fileContentBytes)
 
-$jsonObject = @"
-{
-  "data": "$filecontentencoded",
-  "dataType" :"pfx",
-  "password": "$CERT_PASS"
-}
+	$jsonObject = @"
+	{
+	  "data": "$filecontentencoded",
+	  "dataType" :"pfx",
+	  "password": "$CERT_PASS"
+	}
 "@
 
-$jsonObjectBytes = [System.Text.Encoding]::UTF8.GetBytes($jsonObject)
-$jsonEncoded = [System.Convert]::ToBase64String($jsonObjectBytes)
-
-$secret = ConvertTo-SecureString -String $jsonEncoded -AsPlainText -Force
-Write-Host "Going to store certificate in vault"
-Set-AzureKeyVaultSecret -VaultName $VAULT_NAME -Name $SECRET_NAME -SecretValue $secret | Out-Null
-$secretURL = (Get-AzureKeyVaultSecret -VaultName $VAULT_NAME -Name $SECRET_NAME).Id
+	$jsonObjectBytes = [System.Text.Encoding]::UTF8.GetBytes($jsonObject)
+	$jsonEncoded = [System.Convert]::ToBase64String($jsonObjectBytes)
 
+	$secret = ConvertTo-SecureString -String $jsonEncoded -AsPlainText -Force
+	Write-Host "Going to store certificate in vault"
+	Set-AzureKeyVaultSecret -VaultName $VAULT_NAME -Name $SECRET_NAME -SecretValue $secret | Out-Null
+	$secretURL = (Get-AzureKeyVaultSecret -VaultName $VAULT_NAME -Name $SECRET_NAME).Id
+}else{
+	Write-Host "Secure storage for cert already exists reusing"
+	$secretURL = $secretURL.Id;
+}
 
 $json = Get-Content 'AzureTemplateParams.json' | Out-String | ConvertFrom-Json
 
@@ -101,7 +123,11 @@ if($resourceProviders.length) {
 
 # Start the deployment
 Write-Host "Starting deployment...";
-New-AzureRmResourceGroupDeployment -ResourceGroupName $RESOURCE_GROUP -TemplateParameterObject $hashtable -TemplateFile 'AzureTemplateFile.json';
+New-AzureRmResourceGroupDeployment -ResourceGroupName $RESOURCE_GROUP -TemplateParameterObject $hashtable -TemplateFile 'AzureTemplateFile.json' | Out-Null;
 $vm = Get-AzureRmVM -Name "CefTestVM" -ResourceGroupName $RESOURCE_GROUP
 $ip =Get-AzureRmPublicIpAddress -Name "CefTestVM-ip" -ResourceGroupName $RESOURCE_GROUP
-Write-Host "Public IP: " $ip.IpAddress
+Write-Host "Public IP: " $ip.IpAddress
+
+}catch{
+	WriteException $_;
+}