Merge pull request #4 from FederalCSUMission/davyu-deployTest817

making mods to remove Azure Gov incompatible scripts
FederalCSUMission · Aug 23, 2023 · 15092b8 · 15092b8
2 parents 17dc8da + 3853a46
commit 15092b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 27 deletions.
diff --git a/apps/backend/azuredeploy-backend.json b/apps/backend/azuredeploy-backend.json
@@ -246,14 +246,6 @@
               "name": "AZURE_OPENAI_API_VERSION",
               "value": "[parameters('azureOpenAIAPIVersion')]"
             },
-            {
-              "name": "BING_SEARCH_URL",
-              "value": "[parameters('bingSearchUrl')]"
-            },
-            {
-              "name": "BING_SUBSCRIPTION_KEY",
-              "value": "[listKeys(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('resourceGroupSearch')), 'Microsoft.Bing/accounts', parameters('bingSearchName')), '2020-06-10').key1]"
-            },
             {
               "name": "SQL_SERVER_NAME",
               "value": "[parameters('SQLServerName')]"
@@ -284,7 +276,7 @@
             },
             {
               "name": "AZURE_COMOSDB_CONNECTION_STRING",
-              "value": "[listConnectionStrings(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('resourceGroupSearch')), 'Microsoft.DocumentDB/databaseAccounts', parameters('cosmosDBAccountName')), '2023-04-15').connectionStrings[0].connectionString]"
+              "value": "AccountEndpoint=https://cosmosdb-account-ce5kqagb2csv4.documents.azure.us:443/;AccountKey=dDRyOeP3UJz932LGggjj7i7B8XcfS0k08frvjfS20H3z0aEdYBwsx6HgGDMoDhJVqQ6D8rR8CGD5ACDbhIoauQ==;"
             },
             {
               "name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
@@ -360,7 +352,7 @@
     },
     {
       "type": "Microsoft.BotService/botServices",
-      "apiVersion": "2022-09-15",
+      "apiVersion": "2022-06-15-preview",
       "name": "[parameters('botId')]",
       "location": "global",
       "kind": "azurebot",

diff --git a/apps/frontend/azuredeploy-frontend.json b/apps/frontend/azuredeploy-frontend.json
@@ -150,7 +150,7 @@
             },
             {
               "name": "AZURE_SEARCH_KEY",
-              "value": "[listAdminKeys(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('resourceGroupSearch')), 'Microsoft.Search/searchServices', parameters('azureSearchName')), '2021-04-01-preview').primaryKey]"
+              "value": "cYXHCUXTO54SYaWjqxD56BaTwn0uBE3k0vn0OVDY28AzSeC9kAvJ"
             },
             {
               "name": "AZURE_SEARCH_API_VERSION",

diff --git a/azuredeploy.json b/azuredeploy.json
@@ -94,13 +94,15 @@
       "type": "string",
       "metadata": {
         "description": "Required. The administrator username of the SQL logical server."
-      }
+      },
+      "defaultValue": "aoaiadmin"
     },
     "SQLAdministratorLoginPassword": {
       "type": "securestring",
       "metadata": {
         "description": "Required. The administrator password of the SQL logical server."
-      }
+      },
+      "defaultValue": "Yakuyaku1234!"
     },
     "cosmosDBAccountName": {
       "type": "string",
@@ -160,13 +162,12 @@
       "properties": {
         "replicaCount": "[parameters('azureSearchReplicaCount')]",
         "partitionCount": "[parameters('azureSearchPartitionCount')]",
-        "hostingMode": "[parameters('azureSearchHostingMode')]",
-        "semanticSearch": "free"
+        "hostingMode": "[parameters('azureSearchHostingMode')]"
       }
     },
     {
       "type": "Microsoft.CognitiveServices/accounts",
-      "apiVersion": "2023-05-01",
+      "apiVersion": "2022-12-01",
       "name": "[parameters('cognitiveServiceName')]",
       "location": "[parameters('location')]",
       "sku": {
@@ -273,19 +274,9 @@
         "[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('cosmosDBAccountName'), parameters('cosmosDBDatabaseName'))]"
       ]
     },
-    {
-      "type": "Microsoft.Bing/accounts",
-      "apiVersion": "2020-06-10",
-      "name": "[parameters('bingSearchAPIName')]",
-      "kind": "Bing.Search.v7",
-      "location": "global",
-      "sku": {
-        "name": "S1"
-      }
-    },
     {
       "type": "Microsoft.CognitiveServices/accounts",
-      "apiVersion": "2023-05-01",
+      "apiVersion": "2022-12-01",
       "name": "[parameters('formRecognizerName')]",
       "location": "[parameters('location')]",
       "sku": {