Merge pull request #92 from microsoft/ckm-v2-dev

Ckm v2 dev

Author: brittneek

Deployment/bicep/deploy_azure_ai_service.bicep

@@ -34,4 +34,5 @@ output cogSearchOutput object = {
 cogServiceName:accounts_byc_cogser_name_resource.name
 cogServiceKey : cogServiceKey
 cogServiceEndpoint: accounts_byc_cogser_name_resource.properties.endpoint
+cogServiceRegion: accounts_byc_cogser_name_resource.location
 }

Deployment/bicep/deploy_keyvault.bicep

@@ -86,6 +86,7 @@ param cogServiceEndpoint string
 @secure()
 param cogServiceKey string
 param cogServiceName string
+param cogServiceRegion string
 
 resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = {
   name: kvName
@@ -304,6 +305,14 @@ resource cogServiceNameEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-previ
   }
 }
 
+resource cogServiceRegionEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
+  parent: keyVault
+  name: 'COG-SERVICES-REGION'
+  properties: {
+    value: cogServiceRegion
+  }
+}
+
 resource azureSubscriptionIdEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
   parent: keyVault
   name: 'AZURE-SUBSCRIPTION-ID'

Deployment/bicep/main.bicep

@@ -59,6 +59,7 @@ module keyvaultModule 'deploy_keyvault.bicep' = {
     cogServiceEndpoint:azAIMultiServiceAccount.outputs.cogSearchOutput.cogServiceEndpoint
     cogServiceName:azAIMultiServiceAccount.outputs.cogSearchOutput.cogServiceName
     cogServiceKey:azAIMultiServiceAccount.outputs.cogSearchOutput.cogServiceKey
+    cogServiceRegion:azAIMultiServiceAccount.outputs.cogSearchOutput.cogServiceRegion
     enableSoftDelete:false
   }
   scope: resourceGroup(resourceGroup().name)

Deployment/bicep/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.28.1.47646",
-      "templateHash": "12812951896050089732"
+      "templateHash": "8858477527853866674"
     }
   },
   "parameters": {
@@ -140,7 +140,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.28.1.47646",
-              "templateHash": "13579945607876056775"
+              "templateHash": "8537007800307151650"
             }
           },
           "parameters": {
@@ -191,7 +191,8 @@
               "value": {
                 "cogServiceName": "[parameters('accounts_byc_cogser_name')]",
                 "cogServiceKey": "[listKeys(resourceId('Microsoft.CognitiveServices/accounts', parameters('accounts_byc_cogser_name')), '2023-05-01').key1]",
-                "cogServiceEndpoint": "[reference(resourceId('Microsoft.CognitiveServices/accounts', parameters('accounts_byc_cogser_name')), '2023-05-01').endpoint]"
+                "cogServiceEndpoint": "[reference(resourceId('Microsoft.CognitiveServices/accounts', parameters('accounts_byc_cogser_name')), '2023-05-01').endpoint]",
+                "cogServiceRegion": "[reference(resourceId('Microsoft.CognitiveServices/accounts', parameters('accounts_byc_cogser_name')), '2023-05-01', 'full').location]"
               }
             }
           }
@@ -342,6 +343,9 @@
           "cogServiceKey": {
             "value": "[reference(resourceId('Microsoft.Resources/deployments', 'deploy_azure_ai_service'), '2022-09-01').outputs.cogSearchOutput.value.cogServiceKey]"
           },
+          "cogServiceRegion": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'deploy_azure_ai_service'), '2022-09-01').outputs.cogSearchOutput.value.cogServiceRegion]"
+          },
           "enableSoftDelete": {
             "value": false
           }
@@ -353,7 +357,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.28.1.47646",
-              "templateHash": "12080442094799083554"
+              "templateHash": "12149961923112846409"
             }
           },
           "parameters": {
@@ -492,6 +496,9 @@
             },
             "cogServiceName": {
               "type": "string"
+            },
+            "cogServiceRegion": {
+              "type": "string"
             }
           },
           "variables": {
@@ -633,6 +640,17 @@
                 "[resourceId('Microsoft.KeyVault/vaults', parameters('kvName'))]"
               ]
             },
+            {
+              "type": "Microsoft.KeyVault/vaults/secrets",
+              "apiVersion": "2021-11-01-preview",
+              "name": "[format('{0}/{1}', parameters('kvName'), 'COG-SERVICES-REGION')]",
+              "properties": {
+                "value": "[parameters('cogServiceRegion')]"
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.KeyVault/vaults', parameters('kvName'))]"
+              ]
+            },
             {
               "type": "Microsoft.KeyVault/vaults/secrets",
               "apiVersion": "2021-11-01-preview",

README.md

@@ -206,3 +206,21 @@ If you'd like to customize the accelerator, here are some ways you might do that
 Customer truth
 </h2>
 Customer stories coming soon. For early access, contact: [email protected]
+
+<br/>
+<br/>
+<br/>
+
+---
+
+## Disclaimers
+
+To the extent that the Software includes components or code used in or derived from Microsoft products or services, including without limitation Microsoft Azure Services (collectively, “Microsoft Products and Services”), you must also comply with the Product Terms applicable to such Microsoft Products and Services. You acknowledge and agree that the license governing the Software does not grant you a license or other right to use Microsoft Products and Services. Nothing in the license or this ReadMe file will serve to supersede, amend, terminate or modify any terms in the Product Terms for any Microsoft Products and Services. 
+
+You must also comply with all domestic and international export laws and regulations that apply to the Software, which include restrictions on destinations, end users, and end use. For further information on export restrictions, visit https://aka.ms/exporting. 
+
+You acknowledge that the Software and Microsoft Products and Services (1) are not designed, intended or made available as a medical device(s), and (2) are not designed or intended to be a substitute for professional medical advice, diagnosis, treatment, or judgment and should not be used to replace or as a substitute for professional medical advice, diagnosis, treatment, or judgment. Customer is solely responsible for displaying and/or obtaining appropriate consents, warnings, disclaimers, and acknowledgements to end users of Customer’s implementation of the Online Services. 
+
+You acknowledge the Software is not subject to SOC 1 and SOC 2 compliance audits. No Microsoft technology, nor any of its component technologies, including the Software, is intended or made available as a substitute for the professional advice, opinion, or judgement of a certified financial services professional. Do not use the Software to replace, substitute, or provide professional financial advice or judgment.  
+
+BY ACCESSING OR USING THE SOFTWARE, YOU ACKNOWLEDGE THAT THE SOFTWARE IS NOT DESIGNED OR INTENDED TO SUPPORT ANY USE IN WHICH A SERVICE INTERRUPTION, DEFECT, ERROR, OR OTHER FAILURE OF THE SOFTWARE COULD RESULT IN THE DEATH OR SERIOUS BODILY INJURY OF ANY PERSON OR IN PHYSICAL OR ENVIRONMENTAL DAMAGE (COLLECTIVELY, “HIGH-RISK USE”), AND THAT YOU WILL ENSURE THAT, IN THE EVENT OF ANY INTERRUPTION, DEFECT, ERROR, OR OTHER FAILURE OF THE SOFTWARE, THE SAFETY OF PEOPLE, PROPERTY, AND THE ENVIRONMENT ARE NOT REDUCED BELOW A LEVEL THAT IS REASONABLY, APPROPRIATE, AND LEGAL, WHETHER IN GENERAL OR IN A SPECIFIC INDUSTRY. BY ACCESSING THE SOFTWARE, YOU FURTHER ACKNOWLEDGE THAT YOUR HIGH-RISK USE OF THE SOFTWARE IS AT YOUR OWN RISK.