Merge pull request #130 from microsoft/createDevYml

Create dev yml

Author: gpickett

.azdo/pipelines/azure-dev.yml

@@ -0,0 +1,83 @@
+# Run when commits are pushed to mainline branch (main or master)
+# Set this to the mainline branch you are using
+trigger:
+  - main
+  - master
+
+# Azure Pipelines workflow to deploy to Azure using azd
+# To configure required secrets and service connection for connecting to Azure, simply run `azd pipeline config --provider azdo`
+# Task "Install azd" needs to install setup-azd extension for azdo - https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azd
+# See below for alternative task to install azd if you can't install above task in your organization
+
+pool:
+  vmImage: ubuntu-latest
+
+steps:
+  - task: setup-azd@0
+    displayName: Install azd
+
+  # If you can't install above task in your organization, you can comment it and uncomment below task to install azd
+  # - task: Bash@3
+  #   displayName: Install azd
+  #   inputs:
+  #     targetType: 'inline'
+  #     script: |
+  #       curl -fsSL https://aka.ms/install-azd.sh | bash
+
+  # azd delegate auth to az to use service connection with AzureCLI@2
+  - pwsh: |
+      azd config set auth.useAzCliAuth "true"
+    displayName: Configure AZD to Use AZ CLI Authentication.
+
+  - task: AzureCLI@2
+    displayName: Provision Infrastructure
+    inputs:
+      azureSubscription: azconnection
+      scriptType: bash
+      scriptLocation: inlineScript
+      inlineScript: |
+        azd provision --no-prompt
+    env:
+      
+      AZURE_SUBSCRIPTION_ID: $(AZURE_SUBSCRIPTION_ID)
+      AZURE_ENV_NAME: $(AZURE_ENV_NAME)
+      AZURE_LOCATION: $(AZURE_LOCATION)
+      # Project specific environment variables
+      # AZURE_RESOURCE_GROUP: $(AZURE_RESOURCE_GROUP)
+      # AZURE_AIHUB_NAME: $(AZURE_AIHUB_NAME)
+      # AZURE_AIPROJECT_NAME: $(AZURE_AIPROJECT_NAME)
+      # AZURE_AISERVICES_NAME: $(AZURE_AISERVICES_NAME)
+      # AZURE_SEARCH_SERVICE_NAME: $(AZURE_SEARCH_SERVICE_NAME)
+      # AZURE_APPLICATION_INSIGHTS_NAME: $(AZURE_APPLICATION_INSIGHTS_NAME)
+      # AZURE_CONTAINER_REGISTRY_NAME: $(AZURE_CONTAINER_REGISTRY_NAME)
+      # AZURE_KEYVAULT_NAME: $(AZURE_KEYVAULT_NAME)
+      # AZURE_STORAGE_ACCOUNT_NAME: $(AZURE_STORAGE_ACCOUNT_NAME)
+      # AZURE_LOG_ANALYTICS_WORKSPACE_NAME: $(AZURE_LOG_ANALYTICS_WORKSPACE_NAME)
+      # USE_CONTAINER_REGISTRY: $(USE_CONTAINER_REGISTRY)
+      # USE_APPLICATION_INSIGHTS: $(USE_APPLICATION_INSIGHTS)
+      # USE_SEARCH_SERVICE: $(USE_SEARCH_SERVICE)
+      # AZURE_AI_CHAT_DEPLOYMENT_NAME: $(AZURE_AI_CHAT_DEPLOYMENT_NAME)
+      # AZURE_AI_CHAT_DEPLOYMENT_SKU: $(AZURE_AI_CHAT_DEPLOYMENT_SKU)
+      # AZURE_AI_CHAT_DEPLOYMENT_CAPACITY: $(AZURE_AI_CHAT_DEPLOYMENT_CAPACITY)
+      # AZURE_AI_CHAT_MODEL_FORMAT: $(AZURE_AI_CHAT_MODEL_FORMAT)
+      # AZURE_AI_CHAT_MODEL_NAME: $(AZURE_AI_CHAT_MODEL)
+      # AZURE_AI_CHAT_MODEL_VERSION: $(AZURE_AI_CHAT_MODEL_VERSION)
+      # AZURE_AI_EMBED_DEPLOYMENT_NAME: $(AZURE_AI_EMBED_DEPLOYMENT_NAME)
+      # AZURE_AI_EMBED_DEPLOYMENT_SKU: $(AZURE_AI_EMBED_DEPLOYMENT_SKU)
+      # AZURE_AI_EMBED_DEPLOYMENT_CAPACITY: $(AZURE_AI_EMBED_DEPLOYMENT_CAPACITY)
+      # AZURE_AI_EMBED_MODEL_FORMAT: $(AZURE_AI_EMBED_MODEL_FORMAT)
+      # AZURE_AI_EMBED_MODEL_NAME: $(AZURE_AI_EMBED_MODEL_NAME)
+      # AZURE_AI_EMBED_MODEL_VERSION: $(AZURE_AI_EMBED_MODEL_VERSION)
+      # AZURE_EXISTING_AIPROJECT_CONNECTION_STRING: $(AZURE_EXISTING_AIPROJECT_CONNECTION_STRING)
+  - task: AzureCLI@2
+    displayName: Deploy Application
+    inputs:
+      azureSubscription: azconnection
+      scriptType: bash
+      scriptLocation: inlineScript
+      inlineScript: |
+        azd deploy --no-prompt
+    env:
+      AZURE_SUBSCRIPTION_ID: $(AZURE_SUBSCRIPTION_ID)
+      AZURE_ENV_NAME: $(AZURE_ENV_NAME)
+      AZURE_LOCATION: $(AZURE_LOCATION)

README.md

@@ -1,3 +1,18 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
-name: multi-agent-custom-automation-engine-solution-accelerator
 
+name: multi-agent-custom-automation-engine-solution-accelerator
+metadata:
+    template: azd-init@1.14.0
+services:
+    backend:
+        project: src/backend
+        host: containerapp
+        language: python
+        docker:
+            path: Dockerfile
+    frontend:
+        project: src/frontend
+        host: containerapp
+        language: python
+        docker:
+            path: Dockerfile

azure.yaml

@@ -1,6 +1,6 @@
 targetScope = 'resourceGroup'
 @description('Location for all resources.')
-param location string
+param location string = 'EastUS2' //Fixed for model availability, change back to resourceGroup().location
 
 @allowed([
   'australiaeast'

documentation/images/readme/business-scenario.png

@@ -5,14 +5,13 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.34.44.8038",
-      "templateHash": "2906892014954666053"
+      "version": "0.28.1.47646",
+      "templateHash": "1631755345697758847"
     }
   },
   "parameters": {
     "location": {
       "type": "string",
-      "defaultValue": "EastUS2",
       "metadata": {
         "description": "Location for all resources."
       }
@@ -26,7 +25,7 @@
     },
     "prefix": {
       "type": "string",
-      "defaultValue": "macaeo",
+      "defaultValue": "[take(format('macaeo-{0}', uniqueString(resourceGroup().id)), 10)]",
       "metadata": {
         "description": "A prefix to add to the start of all resource names. Note: A \"unique\" suffix will also be added"
       }
@@ -245,6 +244,7 @@
       },
       "dependsOn": [
         "aiServices",
+        "aoaiUserRoleDefinition",
         "containerApp"
       ]
     },
@@ -403,9 +403,9 @@
       "dependsOn": [
         "aiServices",
         "appInsights",
+        "cosmos::autogenDb",
         "containerAppEnv",
         "cosmos",
-        "cosmos::autogenDb",
         "cosmos::autogenDb::memoryContainer",
         "pullIdentity"
       ],
@@ -500,8 +500,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.44.8038",
-              "templateHash": "10664495342911727649"
+              "version": "0.28.1.47646",
+              "templateHash": "9096960510978747660"
             }
           },
           "parameters": {
@@ -638,8 +638,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.44.8038",
-              "templateHash": "12550713338937452696"
+              "version": "0.28.1.47646",
+              "templateHash": "8215150938757657777"
             }
           },
           "parameters": {
@@ -1028,8 +1028,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.34.44.8038",
-              "templateHash": "11364190519186458619"
+              "version": "0.28.1.47646",
+              "templateHash": "15814429030073463584"
             }
           },
           "parameters": {

documentation/images/readme/quick-deploy.png

@@ -17,7 +17,8 @@ To troubleshoot any issues, see [troubleshooting](#troubleshooting).
 
 ### Configure environment variables for running services
 
-Configure environment variables for running services by updating `settings` in [main.parameters.json](./infra/main.parameters.json).
+Environment variables can be configured by modifying the `env` settings in [resources.bicep](./infra/resources.bicep).
+To define a secret, add the variable as a `secretRef` pointing to a `secrets` entry or a stored KeyVault secret.
 
 ### Configure CI/CD pipeline