Skip to content

Commit c221d1c

Browse files
Fr4nc3Fr4nc3
committed
Merge remote-tracking branch 'origin/MultiAZDDeploy' into feature/azd-semantickernel
2 parents 1d056a6 + e27fea0 commit c221d1c

22 files changed

+4711
-15
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
{
22
"name": "Multi Agent Custom Automation Engine Solution Accelerator",
3-
"image": "mcr.microsoft.com/devcontainers/python:3.10",
3+
"image": "mcr.microsoft.com/devcontainers/javascript-node:20-bullseye",
44
"features": {
5-
"ghcr.io/devcontainers/features/azure-cli:1.0.8": {},
5+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
6+
},
67
"ghcr.io/azure/azure-dev/azd:latest": {},
7-
"ghcr.io/rchaganti/vsc-devcontainer-features/azurebicep:1.0.5": {}
8+
"ghcr.io/devcontainers/features/azure-cli:1": {}
89
},
9-
10-
"postCreateCommand": "sudo chmod +x .devcontainer/setupEnv.sh && ./.devcontainer/setupEnv.sh",
11-
1210
"customizations": {
1311
"vscode": {
1412
"extensions": [
13+
"dbaeumer.vscode-eslint",
14+
"esbenp.prettier-vscode",
15+
"GitHub.vscode-github-actions",
1516
"ms-azuretools.azure-dev",
17+
"ms-azuretools.vscode-azurefunctions",
1618
"ms-azuretools.vscode-bicep",
17-
"ms-python.python"
18-
]
19-
},
20-
"codespaces": {
21-
"openFiles": [
22-
"README.md"
19+
"ms-azuretools.vscode-docker",
20+
"ms-vscode.js-debug",
21+
"ms-vscode.vscode-node-azure-pack"
2322
]
2423
}
2524
},
26-
27-
"remoteUser": "vscode",
25+
"forwardPorts": [3000, 3100],
26+
"remoteUser": "node",
2827
"hostRequirements": {
2928
"memory": "8gb"
3029
}

‎.github/workflows/azure-dev.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Azure Template Validation
2+
on:
3+
workflow_dispatch:
4+
5+
permissions:
6+
contents: read
7+
id-token: write
8+
pull-requests: write
9+
10+
jobs:
11+
template_validation_job:
12+
runs-on: ubuntu-latest
13+
name: Template validation
14+
15+
steps:
16+
# Step 1: Checkout the code from your repository
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
20+
# Step 2: Validate the Azure template using microsoft/template-validation-action
21+
- name: Validate Azure Template
22+
uses: microsoft/[email protected]
23+
id: validation
24+
env:
25+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
26+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
27+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
28+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
29+
AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
30+
AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
33+
# Step 3: Print the result of the validation
34+
- name: Print result
35+
run: cat ${{ steps.validation.outputs.resultFile }}

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,4 +456,5 @@ __pycache__/
456456
*.xsd.cs
457457

458458
*.whl
459-
!autogen_core-0.3.dev0-py3-none-any.whl
459+
!autogen_core-0.3.dev0-py3-none-any.whl
460+
.azure

‎azure.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
2+
environment:
3+
name: multi-agent-custom-automation-engine-solution-accelerator
4+
location: eastus
5+
name: multi-agent-custom-automation-engine-solution-accelerator
6+
# metadata:
7+
# template: [email protected]
8+
parameters:
9+
baseUrl:
10+
type: string
11+
default: 'https://github.com/TravisHilbert/Modernize-your-code-solution-accelerator'
12+
deployment:
13+
mode: Incremental
14+
template: ./infra/main.bicep # Path to the main.bicep file inside the 'deployment' folder

‎infra/abbreviations.json‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
{
2+
"analysisServicesServers": "as",
3+
"apiManagementService": "apim-",
4+
"appConfigurationStores": "appcs-",
5+
"appManagedEnvironments": "cae-",
6+
"appContainerApps": "ca-",
7+
"authorizationPolicyDefinitions": "policy-",
8+
"automationAutomationAccounts": "aa-",
9+
"blueprintBlueprints": "bp-",
10+
"blueprintBlueprintsArtifacts": "bpa-",
11+
"cacheRedis": "redis-",
12+
"cdnProfiles": "cdnp-",
13+
"cdnProfilesEndpoints": "cdne-",
14+
"cognitiveServicesAccounts": "cog-",
15+
"cognitiveServicesFormRecognizer": "cog-fr-",
16+
"cognitiveServicesTextAnalytics": "cog-ta-",
17+
"computeAvailabilitySets": "avail-",
18+
"computeCloudServices": "cld-",
19+
"computeDiskEncryptionSets": "des",
20+
"computeDisks": "disk",
21+
"computeDisksOs": "osdisk",
22+
"computeGalleries": "gal",
23+
"computeSnapshots": "snap-",
24+
"computeVirtualMachines": "vm",
25+
"computeVirtualMachineScaleSets": "vmss-",
26+
"containerInstanceContainerGroups": "ci",
27+
"containerRegistryRegistries": "cr",
28+
"containerServiceManagedClusters": "aks-",
29+
"databricksWorkspaces": "dbw-",
30+
"dataFactoryFactories": "adf-",
31+
"dataLakeAnalyticsAccounts": "dla",
32+
"dataLakeStoreAccounts": "dls",
33+
"dataMigrationServices": "dms-",
34+
"dBforMySQLServers": "mysql-",
35+
"dBforPostgreSQLServers": "psql-",
36+
"devicesIotHubs": "iot-",
37+
"devicesProvisioningServices": "provs-",
38+
"devicesProvisioningServicesCertificates": "pcert-",
39+
"documentDBDatabaseAccounts": "cosmos-",
40+
"documentDBMongoDatabaseAccounts": "cosmon-",
41+
"eventGridDomains": "evgd-",
42+
"eventGridDomainsTopics": "evgt-",
43+
"eventGridEventSubscriptions": "evgs-",
44+
"eventHubNamespaces": "evhns-",
45+
"eventHubNamespacesEventHubs": "evh-",
46+
"hdInsightClustersHadoop": "hadoop-",
47+
"hdInsightClustersHbase": "hbase-",
48+
"hdInsightClustersKafka": "kafka-",
49+
"hdInsightClustersMl": "mls-",
50+
"hdInsightClustersSpark": "spark-",
51+
"hdInsightClustersStorm": "storm-",
52+
"hybridComputeMachines": "arcs-",
53+
"insightsActionGroups": "ag-",
54+
"insightsComponents": "appi-",
55+
"keyVaultVaults": "kv-",
56+
"kubernetesConnectedClusters": "arck",
57+
"kustoClusters": "dec",
58+
"kustoClustersDatabases": "dedb",
59+
"logicIntegrationAccounts": "ia-",
60+
"logicWorkflows": "logic-",
61+
"machineLearningServicesWorkspaces": "mlw-",
62+
"managedIdentityUserAssignedIdentities": "id-",
63+
"managementManagementGroups": "mg-",
64+
"migrateAssessmentProjects": "migr-",
65+
"networkApplicationGateways": "agw-",
66+
"networkApplicationSecurityGroups": "asg-",
67+
"networkAzureFirewalls": "afw-",
68+
"networkBastionHosts": "bas-",
69+
"networkConnections": "con-",
70+
"networkDnsZones": "dnsz-",
71+
"networkExpressRouteCircuits": "erc-",
72+
"networkFirewallPolicies": "afwp-",
73+
"networkFirewallPoliciesWebApplication": "waf",
74+
"networkFirewallPoliciesRuleGroups": "wafrg",
75+
"networkFrontDoors": "fd-",
76+
"networkFrontdoorWebApplicationFirewallPolicies": "fdfp-",
77+
"networkLoadBalancersExternal": "lbe-",
78+
"networkLoadBalancersInternal": "lbi-",
79+
"networkLoadBalancersInboundNatRules": "rule-",
80+
"networkLocalNetworkGateways": "lgw-",
81+
"networkNatGateways": "ng-",
82+
"networkNetworkInterfaces": "nic-",
83+
"networkNetworkSecurityGroups": "nsg-",
84+
"networkNetworkSecurityGroupsSecurityRules": "nsgsr-",
85+
"networkNetworkWatchers": "nw-",
86+
"networkPrivateDnsZones": "pdnsz-",
87+
"networkPrivateLinkServices": "pl-",
88+
"networkPublicIPAddresses": "pip-",
89+
"networkPublicIPPrefixes": "ippre-",
90+
"networkRouteFilters": "rf-",
91+
"networkRouteTables": "rt-",
92+
"networkRouteTablesRoutes": "udr-",
93+
"networkTrafficManagerProfiles": "traf-",
94+
"networkVirtualNetworkGateways": "vgw-",
95+
"networkVirtualNetworks": "vnet-",
96+
"networkVirtualNetworksSubnets": "snet-",
97+
"networkVirtualNetworksVirtualNetworkPeerings": "peer-",
98+
"networkVirtualWans": "vwan-",
99+
"networkVpnGateways": "vpng-",
100+
"networkVpnGatewaysVpnConnections": "vcn-",
101+
"networkVpnGatewaysVpnSites": "vst-",
102+
"notificationHubsNamespaces": "ntfns-",
103+
"notificationHubsNamespacesNotificationHubs": "ntf-",
104+
"operationalInsightsWorkspaces": "log-",
105+
"portalDashboards": "dash-",
106+
"powerBIDedicatedCapacities": "pbi-",
107+
"purviewAccounts": "pview-",
108+
"recoveryServicesVaults": "rsv-",
109+
"resourcesResourceGroups": "rg-",
110+
"searchSearchServices": "srch-",
111+
"serviceBusNamespaces": "sb-",
112+
"serviceBusNamespacesQueues": "sbq-",
113+
"serviceBusNamespacesTopics": "sbt-",
114+
"serviceEndPointPolicies": "se-",
115+
"serviceFabricClusters": "sf-",
116+
"signalRServiceSignalR": "sigr",
117+
"sqlManagedInstances": "sqlmi-",
118+
"sqlServers": "sql-",
119+
"sqlServersDataWarehouse": "sqldw-",
120+
"sqlServersDatabases": "sqldb-",
121+
"sqlServersDatabasesStretch": "sqlstrdb-",
122+
"storageStorageAccounts": "st",
123+
"storageStorageAccountsVm": "stvm",
124+
"storSimpleManagers": "ssimp",
125+
"streamAnalyticsCluster": "asa-",
126+
"synapseWorkspaces": "syn",
127+
"synapseWorkspacesAnalyticsWorkspaces": "synw",
128+
"synapseWorkspacesSqlPoolsDedicated": "syndp",
129+
"synapseWorkspacesSqlPoolsSpark": "synsp",
130+
"timeSeriesInsightsEnvironments": "tsi-",
131+
"webServerFarms": "plan-",
132+
"webSitesAppService": "app-",
133+
"webSitesAppServiceEnvironment": "ase-",
134+
"webSitesFunctions": "func-",
135+
"webStaticSites": "stapp-"
136+
}

0 commit comments

Comments
 (0)