Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ resource ehstorage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
properties: {
accessTier: 'Hot'
allowSharedKeyAccess: false
isHnsEnabled: false
minimumTlsVersion: 'TLS1_2'
networkAcls: {
defaultAction: 'Allow'
Expand All @@ -23,8 +24,12 @@ resource ehstorage 'Microsoft.Storage/storageAccounts@2024-01-01' = {

output blobEndpoint string = ehstorage.properties.primaryEndpoints.blob

output dataLakeEndpoint string = ehstorage.properties.primaryEndpoints.dfs

output queueEndpoint string = ehstorage.properties.primaryEndpoints.queue

output tableEndpoint string = ehstorage.properties.primaryEndpoints.table

output name string = ehstorage.name
output name string = ehstorage.name

output id string = ehstorage.id
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,6 @@ resource api_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: webapp
}

resource slotConfigNames 'Microsoft.Web/sites/config@2025-03-01' = {
name: 'slotConfigNames'
properties: {
appSettingNames: [
'OTEL_SERVICE_NAME'
]
}
parent: webapp
}

resource mainContainerSlot 'Microsoft.Web/sites/slots/sitecontainers@2025-03-01' = {
name: 'main'
properties: {
Expand Down Expand Up @@ -288,3 +278,13 @@ resource api_website_slot_ra 'Microsoft.Authorization/roleAssignments@2022-04-01
}
scope: webappslot
}

resource slotConfigNames 'Microsoft.Web/sites/config@2025-03-01' = {
name: 'slotConfigNames'
properties: {
appSettingNames: [
'OTEL_SERVICE_NAME'
]
}
parent: webapp
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
accessTier: 'Hot'
allowBlobPublicAccess: false
allowSharedKeyAccess: false
isHnsEnabled: false
minimumTlsVersion: 'TLS1_2'
networkAcls: {
defaultAction: 'Allow'
Expand All @@ -24,8 +25,12 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {

output blobEndpoint string = storage.properties.primaryEndpoints.blob

output dataLakeEndpoint string = storage.properties.primaryEndpoints.dfs

output queueEndpoint string = storage.properties.primaryEndpoints.queue

output tableEndpoint string = storage.properties.primaryEndpoints.table

output name string = storage.name
output name string = storage.name

output id string = storage.id
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
properties: {
accessTier: 'Hot'
allowSharedKeyAccess: false
isHnsEnabled: false
minimumTlsVersion: 'TLS1_2'
networkAcls: {
defaultAction: 'Allow'
Expand All @@ -23,8 +24,12 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {

output blobEndpoint string = storage.properties.primaryEndpoints.blob

output dataLakeEndpoint string = storage.properties.primaryEndpoints.dfs

output queueEndpoint string = storage.properties.primaryEndpoints.queue

output tableEndpoint string = storage.properties.primaryEndpoints.table

output name string = storage.name
output name string = storage.name

output id string = storage.id
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ resource apiservice 'Microsoft.App/containerApps@2025-02-02-preview' = {
}
{
name: 'FUNCAPP_HTTP'
value: 'http://funcapp.${env_outputs_azure_container_apps_environment_default_domain}'
value: 'https://funcapp.${env_outputs_azure_container_apps_environment_default_domain}'
}
{
name: 'services__funcapp__http__0'
value: 'http://funcapp.${env_outputs_azure_container_apps_environment_default_domain}'
value: 'https://funcapp.${env_outputs_azure_container_apps_environment_default_domain}'
}
{
name: 'FUNCAPP_HTTPS'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
"funcstorage67c6c_outputs_blobendpoint": "{funcstorage67c6c.outputs.blobEndpoint}",
"funcstorage67c6c_outputs_queueendpoint": "{funcstorage67c6c.outputs.queueEndpoint}",
"funcstorage67c6c_outputs_tableendpoint": "{funcstorage67c6c.outputs.tableEndpoint}",
"funcstorage67c6c_outputs_datalakeendpoint": "{funcstorage67c6c.outputs.dataLakeEndpoint}",
"eventhubs_outputs_eventhubsendpoint": "{eventhubs.outputs.eventHubsEndpoint}",
"messaging_outputs_servicebusendpoint": "{messaging.outputs.serviceBusEndpoint}",
"cosmosdb_outputs_connectionstring": "{cosmosdb.outputs.connectionString}",
Expand All @@ -101,9 +102,11 @@
"AzureWebJobsStorage__blobServiceUri": "{funcstorage67c6c.outputs.blobEndpoint}",
"AzureWebJobsStorage__queueServiceUri": "{funcstorage67c6c.outputs.queueEndpoint}",
"AzureWebJobsStorage__tableServiceUri": "{funcstorage67c6c.outputs.tableEndpoint}",
"AzureWebJobsStorage__dataLakeServiceUri": "{funcstorage67c6c.outputs.dataLakeEndpoint}",
"Aspire__Azure__Storage__Blobs__AzureWebJobsStorage__ServiceUri": "{funcstorage67c6c.outputs.blobEndpoint}",
"Aspire__Azure__Storage__Queues__AzureWebJobsStorage__ServiceUri": "{funcstorage67c6c.outputs.queueEndpoint}",
"Aspire__Azure__Data__Tables__AzureWebJobsStorage__ServiceUri": "{funcstorage67c6c.outputs.tableEndpoint}",
"Aspire__Azure__Storage__Files__DataLake__AzureWebJobsStorage__ServiceUri": "{funcstorage67c6c.outputs.dataLakeEndpoint}",
"myhub__fullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
"Aspire__Azure__Messaging__EventHubs__EventHubProducerClient__myhub__FullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
"Aspire__Azure__Messaging__EventHubs__EventHubConsumerClient__myhub__FullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ param funcstorage67c6c_outputs_queueendpoint string

param funcstorage67c6c_outputs_tableendpoint string

param funcstorage67c6c_outputs_datalakeendpoint string

param eventhubs_outputs_eventhubsendpoint string

param messaging_outputs_servicebusendpoint string
Expand Down Expand Up @@ -93,6 +95,10 @@ resource funcapp 'Microsoft.App/containerApps@2025-02-02-preview' = {
name: 'AzureWebJobsStorage__tableServiceUri'
value: funcstorage67c6c_outputs_tableendpoint
}
{
name: 'AzureWebJobsStorage__dataLakeServiceUri'
value: funcstorage67c6c_outputs_datalakeendpoint
}
{
name: 'Aspire__Azure__Storage__Blobs__AzureWebJobsStorage__ServiceUri'
value: funcstorage67c6c_outputs_blobendpoint
Expand All @@ -105,6 +111,10 @@ resource funcapp 'Microsoft.App/containerApps@2025-02-02-preview' = {
name: 'Aspire__Azure__Data__Tables__AzureWebJobsStorage__ServiceUri'
value: funcstorage67c6c_outputs_tableendpoint
}
{
name: 'Aspire__Azure__Storage__Files__DataLake__AzureWebJobsStorage__ServiceUri'
value: funcstorage67c6c_outputs_datalakeendpoint
}
{
name: 'myhub__fullyQualifiedNamespace'
value: eventhubs_outputs_eventhubsendpoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ resource funcstorage67c6c 'Microsoft.Storage/storageAccounts@2024-01-01' = {
properties: {
accessTier: 'Hot'
allowSharedKeyAccess: false
isHnsEnabled: false
minimumTlsVersion: 'TLS1_2'
networkAcls: {
defaultAction: 'Allow'
Expand All @@ -23,8 +24,12 @@ resource funcstorage67c6c 'Microsoft.Storage/storageAccounts@2024-01-01' = {

output blobEndpoint string = funcstorage67c6c.properties.primaryEndpoints.blob

output dataLakeEndpoint string = funcstorage67c6c.properties.primaryEndpoints.dfs

output queueEndpoint string = funcstorage67c6c.properties.primaryEndpoints.queue

output tableEndpoint string = funcstorage67c6c.properties.primaryEndpoints.table

output name string = funcstorage67c6c.name
output name string = funcstorage67c6c.name

output id string = funcstorage67c6c.id
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
properties: {
accessTier: 'Hot'
allowSharedKeyAccess: false
isHnsEnabled: false
minimumTlsVersion: 'TLS1_2'
networkAcls: {
defaultAction: 'Allow'
Expand All @@ -33,8 +34,12 @@ resource myblobcontainer 'Microsoft.Storage/storageAccounts/blobServices/contain

output blobEndpoint string = storage.properties.primaryEndpoints.blob

output dataLakeEndpoint string = storage.properties.primaryEndpoints.dfs

output queueEndpoint string = storage.properties.primaryEndpoints.queue

output tableEndpoint string = storage.properties.primaryEndpoints.table

output name string = storage.name
output name string = storage.name

output id string = storage.id
21 changes: 18 additions & 3 deletions playground/DotnetTool/DotnetTool.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
"exec",
"dotnet-ef",
"--source",
"C:\\Users\\runneradmin\\AppData\\Local\\Temp\\does-not-exist\\0696e702-e9d7-4b59-8a85-cc0d069cf740",
"C:\\Users\\runneradmin\\AppData\\Local\\Temp\\does-not-exist\\d9977b8f-523a-45af-8157-d159efc77137",
"--ignore-failed-sources",
"--yes",
"--"
Expand All @@ -200,7 +200,7 @@
"exec",
"dotnet-ef",
"--source",
"C:\\Users\\runneradmin\\AppData\\Local\\Temp\\does-not-exist\\0696e702-e9d7-4b59-8a85-cc0d069cf740",
"C:\\Users\\runneradmin\\AppData\\Local\\Temp\\does-not-exist\\d9977b8f-523a-45af-8157-d159efc77137",
"--ignore-failed-sources",
"--version",
"10.0.*",
Expand All @@ -220,7 +220,7 @@
"exec",
"dotnet-ef",
"--source",
"C:\\Users\\runneradmin\\AppData\\Local\\Temp\\does-not-exist\\0696e702-e9d7-4b59-8a85-cc0d069cf740",
"C:\\Users\\runneradmin\\AppData\\Local\\Temp\\does-not-exist\\d9977b8f-523a-45af-8157-d159efc77137",
"--ignore-failed-sources",
"--prerelease",
"--yes",
Expand Down Expand Up @@ -256,6 +256,21 @@
"env": {
"NUGET_PACKAGES": "D:\\a\\aspire\\aspire\\artifacts\\obj\\DotnetTool.AppHost\\.aspire\\nuget"
}
},
"incompatibleSdk": {
"type": "executable.v0",
"workingDirectory": "IncompatibleSdk",
"command": "dotnet",
"args": [
"tool",
"exec",
"dotnet-ef",
"--yes",
"--"
],
"env": {
"NUGET_PACKAGES": "D:\\a\\aspire\\aspire\\artifacts\\obj\\DotnetTool.AppHost\\.aspire\\nuget"
}
}
}
}
7 changes: 6 additions & 1 deletion playground/bicep/BicepSample.AppHost/storage.module.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
properties: {
accessTier: 'Hot'
allowSharedKeyAccess: false
isHnsEnabled: false
minimumTlsVersion: 'TLS1_2'
networkAcls: {
defaultAction: 'Allow'
Expand All @@ -23,8 +24,12 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {

output blobEndpoint string = storage.properties.primaryEndpoints.blob

output dataLakeEndpoint string = storage.properties.primaryEndpoints.dfs

output queueEndpoint string = storage.properties.primaryEndpoints.queue

output tableEndpoint string = storage.properties.primaryEndpoints.table

output name string = storage.name
output name string = storage.name

output id string = storage.id
7 changes: 6 additions & 1 deletion playground/cdk/CdkSample.AppHost/storage.module.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {
properties: {
accessTier: 'Hot'
allowSharedKeyAccess: false
isHnsEnabled: false
minimumTlsVersion: 'TLS1_2'
networkAcls: {
defaultAction: 'Allow'
Expand All @@ -27,8 +28,12 @@ resource storage 'Microsoft.Storage/storageAccounts@2024-01-01' = {

output blobEndpoint string = storage.properties.primaryEndpoints.blob

output dataLakeEndpoint string = storage.properties.primaryEndpoints.dfs

output queueEndpoint string = storage.properties.primaryEndpoints.queue

output tableEndpoint string = storage.properties.primaryEndpoints.table

output name string = storage.name
output name string = storage.name

output id string = storage.id
3 changes: 3 additions & 0 deletions playground/deployers/Deployers.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@
"funcstorage6662c_outputs_blobendpoint": "{funcstorage6662c.outputs.blobEndpoint}",
"funcstorage6662c_outputs_queueendpoint": "{funcstorage6662c.outputs.queueEndpoint}",
"funcstorage6662c_outputs_tableendpoint": "{funcstorage6662c.outputs.tableEndpoint}",
"funcstorage6662c_outputs_datalakeendpoint": "{funcstorage6662c.outputs.dataLakeEndpoint}",
"eventhubs_outputs_eventhubsendpoint": "{eventhubs.outputs.eventHubsEndpoint}",
"messaging_outputs_servicebusendpoint": "{messaging.outputs.serviceBusEndpoint}",
"cosmosdb_outputs_connectionstring": "{cosmosdb.outputs.connectionString}",
Expand All @@ -358,9 +359,11 @@
"AzureWebJobsStorage__blobServiceUri": "{funcstorage6662c.outputs.blobEndpoint}",
"AzureWebJobsStorage__queueServiceUri": "{funcstorage6662c.outputs.queueEndpoint}",
"AzureWebJobsStorage__tableServiceUri": "{funcstorage6662c.outputs.tableEndpoint}",
"AzureWebJobsStorage__dataLakeServiceUri": "{funcstorage6662c.outputs.dataLakeEndpoint}",
"Aspire__Azure__Storage__Blobs__AzureWebJobsStorage__ServiceUri": "{funcstorage6662c.outputs.blobEndpoint}",
"Aspire__Azure__Storage__Queues__AzureWebJobsStorage__ServiceUri": "{funcstorage6662c.outputs.queueEndpoint}",
"Aspire__Azure__Data__Tables__AzureWebJobsStorage__ServiceUri": "{funcstorage6662c.outputs.tableEndpoint}",
"Aspire__Azure__Storage__Files__DataLake__AzureWebJobsStorage__ServiceUri": "{funcstorage6662c.outputs.dataLakeEndpoint}",
"myhub__fullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
"Aspire__Azure__Messaging__EventHubs__EventHubProducerClient__myhub__FullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
"Aspire__Azure__Messaging__EventHubs__EventHubConsumerClient__myhub__FullyQualifiedNamespace": "{eventhubs.outputs.eventHubsEndpoint}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ param funcstorage6662c_outputs_queueendpoint string

param funcstorage6662c_outputs_tableendpoint string

param funcstorage6662c_outputs_datalakeendpoint string

param eventhubs_outputs_eventhubsendpoint string

param messaging_outputs_servicebusendpoint string
Expand Down Expand Up @@ -93,6 +95,10 @@ resource func_app 'Microsoft.App/containerApps@2025-02-02-preview' = {
name: 'AzureWebJobsStorage__tableServiceUri'
value: funcstorage6662c_outputs_tableendpoint
}
{
name: 'AzureWebJobsStorage__dataLakeServiceUri'
value: funcstorage6662c_outputs_datalakeendpoint
}
{
name: 'Aspire__Azure__Storage__Blobs__AzureWebJobsStorage__ServiceUri'
value: funcstorage6662c_outputs_blobendpoint
Expand All @@ -105,6 +111,10 @@ resource func_app 'Microsoft.App/containerApps@2025-02-02-preview' = {
name: 'Aspire__Azure__Data__Tables__AzureWebJobsStorage__ServiceUri'
value: funcstorage6662c_outputs_tableendpoint
}
{
name: 'Aspire__Azure__Storage__Files__DataLake__AzureWebJobsStorage__ServiceUri'
value: funcstorage6662c_outputs_datalakeendpoint
}
{
name: 'myhub__fullyQualifiedNamespace'
value: eventhubs_outputs_eventhubsendpoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ resource funcstorage6662c 'Microsoft.Storage/storageAccounts@2024-01-01' = {
properties: {
accessTier: 'Hot'
allowSharedKeyAccess: false
isHnsEnabled: false
minimumTlsVersion: 'TLS1_2'
networkAcls: {
defaultAction: 'Allow'
Expand All @@ -23,8 +24,12 @@ resource funcstorage6662c 'Microsoft.Storage/storageAccounts@2024-01-01' = {

output blobEndpoint string = funcstorage6662c.properties.primaryEndpoints.blob

output dataLakeEndpoint string = funcstorage6662c.properties.primaryEndpoints.dfs

output queueEndpoint string = funcstorage6662c.properties.primaryEndpoints.queue

output tableEndpoint string = funcstorage6662c.properties.primaryEndpoints.table

output name string = funcstorage6662c.name
output name string = funcstorage6662c.name

output id string = funcstorage6662c.id
Loading