Merge branch 'main' into ross/ci

Azure-Samples · Jan 31, 2024 · 6a018ec · 6a018ec
2 parents 8c0e2c5 + ca197ad
commit 6a018ec
Show file tree

Hide file tree

Showing 8 changed files with 172 additions and 196 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,10 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # generated frontend files
-static/*.html
-static/assets/*.js
-static/assets/*.map
-static/assets/*.css
+code/app/static/
 
 # User-specific files
 *.rsuser

diff --git a/code/app/frontend/package-lock.json b/code/app/frontend/package-lock.json
diff --git a/code/app/frontend/package.json b/code/app/frontend/package.json
@@ -36,6 +36,6 @@
         "@vitejs/plugin-react": "^3.1.0",
         "prettier": "^2.8.3",
         "typescript": "^4.9.3",
-        "vite": "^4.1.5"
+        "vite": "^4.5.2"
     }
 }
diff --git a/code/app/static/assets/Azure-d0a62656.svg b/code/app/static/assets/Azure-d0a62656.svg
diff --git a/code/app/static/assets/Send-a9ab2367.svg b/code/app/static/assets/Send-a9ab2367.svg
diff --git a/code/app/static/favicon.ico b/code/app/static/favicon.ico
diff --git a/infra/deployment.bicep b/infra/deployment.bicep
@@ -510,6 +510,7 @@ resource Function 'Microsoft.Web/sites@2018-11-01' = {
         { name: 'WEBSITES_ENABLE_APP_SERVICE_STORAGE', value: 'false'}
         { name: 'APPINSIGHTS_INSTRUMENTATIONKEY', value: reference(ApplicationInsights.id, '2015-05-01').InstrumentationKey}
         { name: 'AzureWebJobsStorage', value: 'DefaultEndpointsProtocol=https;AccountName=${StorageAccountName};AccountKey=${listKeys(StorageAccount.id, '2019-06-01').keys[0].value};EndpointSuffix=core.windows.net'}
+        { name: 'AZURE_AUTH_TYPE', value: authType }
         { name: 'AZURE_OPENAI_MODEL', value: AzureOpenAIGPTModel}
         { name: 'AZURE_OPENAI_EMBEDDING_MODEL', value: AzureOpenAIEmbeddingModel}
         { name: 'AZURE_OPENAI_RESOURCE', value: AzureOpenAIResource}

diff --git a/infra/deployment.json b/infra/deployment.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.24.24.22086",
-      "templateHash": "9176113728480332345"
+      "version": "0.23.1.45101",
+      "templateHash": "18188660465230985501"
     }
   },
   "parameters": {
@@ -967,6 +967,10 @@
               "name": "AzureWebJobsStorage",
               "value": "[format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix=core.windows.net', parameters('StorageAccountName'), listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('StorageAccountName')), '2019-06-01').keys[0].value)]"
             },
+            {
+              "name": "AZURE_AUTH_TYPE",
+              "value": "[parameters('authType')]"
+            },
             {
               "name": "AZURE_OPENAI_MODEL",
               "value": "[parameters('AzureOpenAIGPTModel')]"
@@ -1163,8 +1167,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1232,8 +1236,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1301,8 +1305,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1370,8 +1374,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1439,8 +1443,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1508,8 +1512,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1574,8 +1578,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1643,8 +1647,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1712,8 +1716,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1781,8 +1785,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1850,8 +1854,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1919,8 +1923,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -1988,8 +1992,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2054,8 +2058,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2123,8 +2127,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2192,8 +2196,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2261,8 +2265,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2330,8 +2334,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2396,8 +2400,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2465,8 +2469,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2534,8 +2538,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2603,8 +2607,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2669,8 +2673,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2738,8 +2742,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2807,8 +2811,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },
@@ -2876,8 +2880,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.24.24.22086",
-              "templateHash": "2184194315885104837"
+              "version": "0.23.1.45101",
+              "templateHash": "8211880587811090337"
             },
             "description": "Creates a role assignment for a service principal."
           },