Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/8.0] Uses new Azure.Provisioning packages which have been split by resource #3462

Merged
merged 14 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,22 @@
<PackageVersion Include="Microsoft.Azure.SignalR" Version="1.25.1" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.2" />
<!-- Azure Management SDK for .NET dependencies -->
<PackageVersion Include="Azure.Provisioning" Version="0.1.0-beta.2" />
<PackageVersion Include="Azure.Provisioning" Version="0.2.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.AppConfiguration" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.ApplicationInsights" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.CognitiveServices" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.CosmosDB" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.EventHubs" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.KeyVault" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.OperationalInsights" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.PostgreSql" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.Redis" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.Resources" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.Search" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.ServiceBus" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.SignalR" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.Sql" Version="0.1.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.Storage" Version="0.1.0-beta.1" />
<!-- ASP.NET Core dependencies -->
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Version="$(MicrosoftAspNetCoreAuthenticationCertificatePackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
Expand Down
2 changes: 2 additions & 0 deletions eng/refreshManifests.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
..\build.cmd
get-childitem ..\playground\*AppHost.csproj -Recurse | % { "Generating Manifest for: $_"; dotnet run --no-build --project $_.FullName --launch-profile generate-manifest }
2 changes: 1 addition & 1 deletion playground/AWS/AWS.AppHost/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"ASPIRE_ALLOW_UNSECURED_TRANSPORT": "true"
}
},
"manifest-publish": {
"generate-manifest": {
"commandName": "Project",
"commandLineArgs": "--publisher manifest --output-path ./aspire-manifest.json",
"dotnetRunMessages": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@
"DOTNET_ENVIRONMENT": "Development",
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16201"
}
},
"generate-manifest": {
"commandName": "Project",
"launchBrowser": true,
"dotnetRunMessages": true,
"commandLineArgs": "--publisher manifest --output-path aspire-manifest.json",
"applicationUrl": "http://localhost:15270",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"DOTNET_ENVIRONMENT": "Development",
"DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:16201"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,14 @@
"http": {
"scheme": "http",
"protocol": "tcp",
"transport": "http"
"transport": "http",
"external": true
},
"https": {
"scheme": "https",
"protocol": "tcp",
"transport": "http"
"transport": "http",
"external": true
}
}
}
Expand Down
35 changes: 19 additions & 16 deletions playground/AspireEventHub/EventHubs.AppHost/ehstorage.module.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ param principalId string
param principalType string


resource storageAccount_X1L2R0Ykm 'Microsoft.Storage/storageAccounts@2022-09-01' = {
name: toLower(take(concat('ehstorage', uniqueString(resourceGroup().id)), 24))
resource storageAccount_59pNEh4K4 'Microsoft.Storage/storageAccounts@2022-09-01' = {
name: toLower(take('ehstorage${uniqueString(resourceGroup().id)}', 24))
location: location
tags: {
'aspire-resource-name': 'ehstorage'
Expand All @@ -22,46 +22,49 @@ resource storageAccount_X1L2R0Ykm 'Microsoft.Storage/storageAccounts@2022-09-01'
kind: 'StorageV2'
properties: {
accessTier: 'Hot'
networkAcls: {
defaultAction: 'Allow'
}
}
}

resource blobService_6Eo0U74qO 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_X1L2R0Ykm
resource blobService_5WQ0wIU09 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_59pNEh4K4
name: 'default'
properties: {
}
}

resource roleAssignment_QJKNfwb9n 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_X1L2R0Ykm
name: guid(storageAccount_X1L2R0Ykm.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'))
resource roleAssignment_LrhalXYOv 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_59pNEh4K4
name: guid(storageAccount_59pNEh4K4.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')
principalId: principalId
principalType: principalType
}
}

resource roleAssignment_XX2YmbC7m 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_X1L2R0Ykm
name: guid(storageAccount_X1L2R0Ykm.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3'))
resource roleAssignment_DDmC2vNE8 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_59pNEh4K4
name: guid(storageAccount_59pNEh4K4.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3')
principalId: principalId
principalType: principalType
}
}

resource roleAssignment_osDAIpL0k 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_X1L2R0Ykm
name: guid(storageAccount_X1L2R0Ykm.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88'))
resource roleAssignment_4tZWfnMZF 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_59pNEh4K4
name: guid(storageAccount_59pNEh4K4.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')
principalId: principalId
principalType: principalType
}
}

output blobEndpoint string = storageAccount_X1L2R0Ykm.properties.primaryEndpoints.blob
output queueEndpoint string = storageAccount_X1L2R0Ykm.properties.primaryEndpoints.queue
output tableEndpoint string = storageAccount_X1L2R0Ykm.properties.primaryEndpoints.table
output blobEndpoint string = storageAccount_59pNEh4K4.properties.primaryEndpoints.blob
output queueEndpoint string = storageAccount_59pNEh4K4.properties.primaryEndpoints.queue
output tableEndpoint string = storageAccount_59pNEh4K4.properties.primaryEndpoints.table
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ param principalId string
param principalType string


resource eventHubsNamespace_skb4aVCrD 'Microsoft.EventHub/namespaces@2022-10-01-preview' = {
name: toLower(take(concat('eventhubns', uniqueString(resourceGroup().id)), 24))
resource eventHubsNamespace_wORIGuvCQ 'Microsoft.EventHub/namespaces@2021-11-01' = {
name: toLower(take('eventhubns${uniqueString(resourceGroup().id)}', 24))
location: location
tags: {
'aspire-resource-name': 'eventhubns'
Expand All @@ -23,26 +23,25 @@ resource eventHubsNamespace_skb4aVCrD 'Microsoft.EventHub/namespaces@2022-10-01-
name: sku
}
properties: {
minimumTlsVersion: '1.2'
}
}

resource roleAssignment_cky0ZiKdq 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: eventHubsNamespace_skb4aVCrD
name: guid(eventHubsNamespace_skb4aVCrD.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f526a384-b230-433a-b45c-95f59c4a2dec'))
resource roleAssignment_2so8CKuFt 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: eventHubsNamespace_wORIGuvCQ
name: guid(eventHubsNamespace_wORIGuvCQ.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f526a384-b230-433a-b45c-95f59c4a2dec'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f526a384-b230-433a-b45c-95f59c4a2dec')
principalId: principalId
principalType: principalType
}
}

resource eventHub_BTiIwkSy2 'Microsoft.EventHub/namespaces/eventhubs@2022-10-01-preview' = {
parent: eventHubsNamespace_skb4aVCrD
resource eventHub_4BpPMTltx 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = {
parent: eventHubsNamespace_wORIGuvCQ
name: 'hub'
location: location
properties: {
}
}

output eventHubsEndpoint string = eventHubsNamespace_skb4aVCrD.properties.serviceBusEndpoint
output eventHubsEndpoint string = eventHubsNamespace_wORIGuvCQ.properties.serviceBusEndpoint
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
"http": {
"scheme": "http",
"protocol": "tcp",
"transport": "http"
"transport": "http",
"external": true
},
"https": {
"scheme": "https",
"protocol": "tcp",
"transport": "http"
"transport": "http",
"external": true
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ param principalId string
param principalType string


resource searchService_7WkaGluF0 'Microsoft.Search/searchServices@2023-11-01' = {
name: toLower(take(concat('search', uniqueString(resourceGroup().id)), 24))
resource searchService_j3umigYGT 'Microsoft.Search/searchServices@2023-11-01' = {
name: toLower(take('search${uniqueString(resourceGroup().id)}', 24))
location: location
tags: {
'aspire-resource-name': 'search'
Expand All @@ -27,24 +27,24 @@ resource searchService_7WkaGluF0 'Microsoft.Search/searchServices@2023-11-01' =
}
}

resource roleAssignment_7uytIREoa 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: searchService_7WkaGluF0
name: guid(searchService_7WkaGluF0.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8ebe5a00-799e-43f5-93ac-243d3dce84a7'))
resource roleAssignment_f77ijNEYF 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: searchService_j3umigYGT
name: guid(searchService_j3umigYGT.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8ebe5a00-799e-43f5-93ac-243d3dce84a7'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8ebe5a00-799e-43f5-93ac-243d3dce84a7')
principalId: principalId
principalType: principalType
}
}

resource roleAssignment_QpFzCj55x 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: searchService_7WkaGluF0
name: guid(searchService_7WkaGluF0.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7ca78c08-252a-4471-8644-bb5ff32d4ba0'))
resource roleAssignment_s0J7B4aGN 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: searchService_j3umigYGT
name: guid(searchService_j3umigYGT.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7ca78c08-252a-4471-8644-bb5ff32d4ba0'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7ca78c08-252a-4471-8644-bb5ff32d4ba0')
principalId: principalId
principalType: principalType
}
}

output connectionString string = 'Endpoint=https://${searchService_7WkaGluF0.name}.search.windows.net'
output connectionString string = 'Endpoint=https://${searchService_j3umigYGT.name}.search.windows.net'
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ param principalId string
param principalType string


resource storageAccount_65zdmu5tK 'Microsoft.Storage/storageAccounts@2022-09-01' = {
name: toLower(take(concat('storage', uniqueString(resourceGroup().id)), 24))
resource storageAccount_1XR3Um8QY 'Microsoft.Storage/storageAccounts@2022-09-01' = {
name: toLower(take('storage${uniqueString(resourceGroup().id)}', 24))
location: location
tags: {
'aspire-resource-name': 'storage'
Expand All @@ -22,46 +22,49 @@ resource storageAccount_65zdmu5tK 'Microsoft.Storage/storageAccounts@2022-09-01'
kind: 'StorageV2'
properties: {
accessTier: 'Hot'
networkAcls: {
defaultAction: 'Allow'
}
}
}

resource blobService_24WqMwYy8 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_65zdmu5tK
resource blobService_vTLU20GRg 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_1XR3Um8QY
name: 'default'
properties: {
}
}

resource roleAssignment_ryHNwVXTs 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_65zdmu5tK
name: guid(storageAccount_65zdmu5tK.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'))
resource roleAssignment_Gz09cEnxb 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_1XR3Um8QY
name: guid(storageAccount_1XR3Um8QY.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')
principalId: principalId
principalType: principalType
}
}

resource roleAssignment_hqRD0luQx 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_65zdmu5tK
name: guid(storageAccount_65zdmu5tK.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3'))
resource roleAssignment_HRj6MDafS 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_1XR3Um8QY
name: guid(storageAccount_1XR3Um8QY.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3')
principalId: principalId
principalType: principalType
}
}

resource roleAssignment_5PGf5zmoW 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_65zdmu5tK
name: guid(storageAccount_65zdmu5tK.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88'))
resource roleAssignment_r0wA6OpKE 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_1XR3Um8QY
name: guid(storageAccount_1XR3Um8QY.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88'))
properties: {
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '974c5e8b-45b9-4653-ba55-5f855dd0fb88')
principalId: principalId
principalType: principalType
}
}

output blobEndpoint string = storageAccount_65zdmu5tK.properties.primaryEndpoints.blob
output queueEndpoint string = storageAccount_65zdmu5tK.properties.primaryEndpoints.queue
output tableEndpoint string = storageAccount_65zdmu5tK.properties.primaryEndpoints.table
output blobEndpoint string = storageAccount_1XR3Um8QY.properties.primaryEndpoints.blob
output queueEndpoint string = storageAccount_1XR3Um8QY.properties.primaryEndpoints.queue
output tableEndpoint string = storageAccount_1XR3Um8QY.properties.primaryEndpoints.table
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ resource keyVault_IeF8jZvXV 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
name: keyVaultName
}

resource cosmosDBAccount_5pKmb8KAZ 'Microsoft.DocumentDB/databaseAccounts@2023-04-15' = {
name: toLower(take(concat('cosmos', uniqueString(resourceGroup().id)), 24))
resource cosmosDBAccount_MZyw35gqp 'Microsoft.DocumentDB/databaseAccounts@2023-04-15' = {
name: toLower(take('cosmos${uniqueString(resourceGroup().id)}', 24))
location: location
tags: {
'aspire-resource-name': 'cosmos'
Expand All @@ -32,8 +32,8 @@ resource cosmosDBAccount_5pKmb8KAZ 'Microsoft.DocumentDB/databaseAccounts@2023-0
}
}

resource cosmosDBSqlDatabase_OquHUsfBg 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2023-04-15' = {
parent: cosmosDBAccount_5pKmb8KAZ
resource cosmosDBSqlDatabase_LFJis0a6w 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2023-04-15' = {
parent: cosmosDBAccount_MZyw35gqp
name: 'db'
location: location
properties: {
Expand All @@ -48,6 +48,6 @@ resource keyVaultSecret_Ddsc3HjrA 'Microsoft.KeyVault/vaults/secrets@2022-07-01'
name: 'connectionString'
location: location
properties: {
value: 'AccountEndpoint=${cosmosDBAccount_5pKmb8KAZ.properties.documentEndpoint};AccountKey=${cosmosDBAccount_5pKmb8KAZ.listkeys(cosmosDBAccount_5pKmb8KAZ.apiVersion).primaryMasterKey}'
value: 'AccountEndpoint=${cosmosDBAccount_MZyw35gqp.properties.documentEndpoint};AccountKey=${cosmosDBAccount_MZyw35gqp.listkeys(cosmosDBAccount_MZyw35gqp.apiVersion).primaryMasterKey}'
}
}
Loading