fixing bugs in deployment script

Author: dereklegenzoff

00 - Resource Deployment/README.md

@@ -9,20 +9,20 @@ There are two options for deploying the resources to Azure for this solution acc
     1. Provision the required Azure resources
     2. Upload sample data to your storage account
     3. Create a search index
-    4. Update your web app's settings to connect to your new Azure Services
+    4. Print out the values and keys needed for the web app's *appsettings.json*
 
     If you choose to run this script, you can skip the Search Index Creation in the next folder.
 
 2. **Using an ARM Template**: `azuredeploy.json`
 
     To deploy this ARM Template, simply press the button below:
 
+    > Please note that this will only deploy the resources. You'll then need to create a search index in the next step.
+
     <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazure-search-knowledge-mining%2Fmaster%2Fazuredeploy.json" target="_blank">
         <img src="http://azuredeploy.net/deploybutton.png"/>
     </a>
 
-    > Please note that this will only deploy the resources. You'll then need to create a search index in the next step.
-
 ## Prerequisites
 
 1. Access to an Azure Subscription

00 - Resource Deployment/deploy.ps1

@@ -2,10 +2,16 @@
 # Licensed under the MIT License.
 
 Write-Host "Ensuring Azure dependencies are installed."
-Install-Module -Name Az
-Import-Module -Name Az
-Install-Module -Name Az.Search
-Import-Module -Name Az.Search
+if (!(Get-Module -Name Az)) {
+    Write-Host "Installing Az PowerShell..."
+    Install-Module -Name Az
+    Import-Module -Name Az
+}
+if (!(Get-Module -Name Az.Search)) {
+    Write-Host "Installing Az.Search PowerShell..."
+    Install-Module -Name Az.Search
+    Import-Module -Name Az.Search
+}
 
 Write-Host @"
 
@@ -155,26 +161,16 @@ function Deploy
             -Name $storageContainerName `
             -Context $storageContext `
             -Permission Off
-	}
-
-    CreateStorageAccountAndContainer;
-    
 
-    function UploadSampleDocuments
-    {
         Write-Host "Uploading sample_documents directory";
-        
-        # Note: These use the "Azure" api instead of the "Az" api.
-        $storageContext = New-AzureStorageContext `
-            -StorageAccountName $storageAccountName `
-            -StorageAccountKey $global:storageAccountKey
-        
         Push-Location "../sample_documents"
-        ls -File -Recurse | Set-AzureStorageBlobContent -Container $storageContainerName -Context $storageContext -Force
+        ls -File -Recurse | Set-AzStorageBlobContent -Container $storageContainerName -Context $storageContext -Force
         Pop-Location
 	}
 
-    UploadSampleDocuments;
+    CreateStorageAccountAndContainer;
+    
+
 
 
     function CreateSearchServices
@@ -193,10 +189,9 @@ function Deploy
         # Create a new search service
         # Alternatively, you can now use the Az.Search module: https://docs.microsoft.com/en-us/azure/search/search-manage-powershell 
         Write-Host "Creating Search Service";
-        $searchService = New-AzResourceGroupDeployment `
+        $searchService = New-AzSearchService  `
             -ResourceGroupName $resourceGroupName `
-            -TemplateUri "https://gallery.azure.com/artifact/20151001/Microsoft.Search.1.0.9/DeploymentTemplates/searchServiceDefaultTemplate.json" `
-            -NameFromTemplate $searchServiceName `
+            -Name $searchServiceName `
             -Sku $searchSku -Location $location `
             -PartitionCount 1 `
             -ReplicaCount 1
@@ -301,29 +296,21 @@ function Deploy
 
     CreateWebApp;
 
-    
-    function WriteAppSettings
+    function PrintAppsettings
     {
-        Write-Host "Writing App Settings";
-        
-        # Read the existing settings.
-        $filePath = "..\02 - Web UI Template\CognitiveSearch.UI\appsettings.json"
-        $file = ([System.IO.File]::ReadAllText($filePath)  | ConvertFrom-Json)
-
-        # Update the values.
-        $file.SearchServiceName = $searchServiceName
-        $file.SearchApiKey = $global:searchServiceKey
-        $file.SearchIndexName = $indexName
-        $file.SearchIndexerName = $indexerName
-        $file.StorageAccountName = $storageAccountName
-        $file.StorageAccountKey = $global:storageAccountKey
-        $file.StorageContainerAddress = ("https://"+$storageAccountName+".blob.core.windows.net/"+$storageContainerName)
-
-        # Write the settings to the file.
-        $file | ConvertTo-Json | Out-File -FilePath $filePath -Encoding utf8 -Force
+        Write-Host "Copy and paste the following values to update the appsettings.json file described in the next folder:";
+        Write-Host "------------------------------------------------------------";
+        Write-Host "SearchServiceName: '$searchServiceName'";
+        Write-Host "SearchApiKey: '$global:searchServiceKey'";
+        Write-Host "SearchIndexName: '$indexName'";
+        Write-Host "SearchIndexerName: '$indexerName'";
+        Write-Host "StorageAccountName: '$storageAccountName'";
+        Write-Host "StorageAccountKey: '$global:storageAccountKey'";
+        $StorageContainerAddress = ("https://"+$storageAccountName+".blob.core.windows.net/"+$storageContainerName)
+        Write-Host "StorageContainerAddress: '$StorageContainerAddress'";
+        Write-Host "------------------------------------------------------------";
 	}
-
-    WriteAppSettings;
+    PrintAppsettings;
 }
 
 Deploy;

02 - Web UI Template/CognitiveSearch.UI/appsettings.json

@@ -5,6 +5,8 @@
       "Default": "Warning"
     }
   },
+
+  // Required fields
   "SearchServiceName": "",
   "SearchApiKey": "",
   "SearchIndexName": "",
@@ -14,9 +16,15 @@
   "StorageContainerAddress": "https://{storage-account-name}.blob.core.windows.net/{container-name}",
   "KeyField": "metadata_storage_path",
   "IsPathBase64Encoded": true,
+
+  // Optional instrumentation key
   "InstrumentationKey": "",
+
+  // Optional container addresses if using more than one indexer:
   "StorageContainerAddress2": "https://{storage-account-name}.blob.core.windows.net/{container-name}",
   "StorageContainerAddress3": "https://{storage-account-name}.blob.core.windows.net/{container-name}",
+
+  // Optional key to an Azure Maps account if you would like to display the geoLocation field in a map
   "AzureMapsSubscriptionKey": "",
 
   // Set to the name of a facetable field you would like to represent as a graph.