Skip to content

Commit

Permalink
Update manifests (#7096)
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastienros authored Jan 14, 2025
1 parent 78837be commit 9e9f374
Show file tree
Hide file tree
Showing 12 changed files with 184 additions and 22 deletions.
24 changes: 24 additions & 0 deletions playground/AzureServiceBus/ServiceBus.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"$schema": "https://json.schemastore.org/aspire-8.0.json",
"resources": {
"sbemulator": {
"type": "azure.bicep.v0",
"connectionString": "{sbemulator.outputs.serviceBusEndpoint}",
"path": "sbemulator.module.bicep",
"params": {
"principalType": "",
"principalId": ""
}
},
"worker": {
"type": "project.v0",
"path": "../ServiceBusWorker/ServiceBusWorker.csproj",
"env": {
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES": "true",
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory",
"ConnectionStrings__sbemulator": "{sbemulator.connectionString}"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param sku string = 'Standard'

param principalType string

param principalId string

resource sbemulator 'Microsoft.ServiceBus/namespaces@2024-01-01' = {
name: take('sbemulator-${uniqueString(resourceGroup().id)}', 50)
location: location
properties: {
disableLocalAuth: true
}
sku: {
name: sku
}
tags: {
'aspire-resource-name': 'sbemulator'
}
}

resource sbemulator_AzureServiceBusDataOwner 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(sbemulator.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '090c5cfd-751d-490a-894a-3ce6f1109419'))
properties: {
principalId: principalId
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '090c5cfd-751d-490a-894a-3ce6f1109419')
principalType: principalType
}
scope: sbemulator
}

resource queue1 'Microsoft.ServiceBus/namespaces/queues@2024-01-01' = {
name: 'queue1'
properties: {
deadLetteringOnMessageExpiration: false
}
parent: sbemulator
}

resource topic1 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
name: 'topic1'
parent: sbemulator
}

resource sub1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
name: 'sub1'
properties: {
maxDeliveryCount: 10
}
parent: topic1
}

resource app_prop_filter_1 'Microsoft.ServiceBus/namespaces/topics/subscriptions/rules@2024-01-01' = {
name: 'app-prop-filter-1'
properties: {
correlationFilter: {
correlationId: 'id1'
messageId: 'msgid1'
to: 'xyz'
replyTo: 'someQueue'
label: 'subject1'
sessionId: 'session1'
replyToSessionId: 'sessionId'
contentType: 'application/text'
}
filterType: 'CorrelationFilter'
}
parent: sub1
}

output serviceBusEndpoint string = sbemulator.properties.serviceBusEndpoint
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"elasticsearch": {
"type": "container.v0",
"connectionString": "http://elastic:{elasticsearch-password.value}@{elasticsearch.bindings.http.host}:{elasticsearch.bindings.http.port}",
"image": "docker.io/library/elasticsearch:8.15.2",
"image": "docker.io/library/elasticsearch:8.15.3",
"volumes": [
{
"name": "elasticsearch.apphost-93fd2337c1-elasticsearch-data",
Expand Down
2 changes: 1 addition & 1 deletion playground/Qdrant/Qdrant.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"qdrant": {
"type": "container.v0",
"connectionString": "Endpoint={qdrant.bindings.grpc.url};Key={qdrant-Key.value}",
"image": "docker.io/qdrant/qdrant:v1.11.5",
"image": "docker.io/qdrant/qdrant:v1.12.1",
"volumes": [
{
"name": "qdrant-data",
Expand Down
11 changes: 9 additions & 2 deletions playground/Stress/Stress.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES": "true",
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory",
"ASPNETCORE_FORWARDEDHEADERS_ENABLED": "true",
"HTTP_PORTS": "{stress-apiservice.bindings.http-5180.targetPort};{stress-apiservice.bindings.http-5181.targetPort};{stress-apiservice.bindings.http-5182.targetPort};{stress-apiservice.bindings.http-5183.targetPort};{stress-apiservice.bindings.http-5184.targetPort};{stress-apiservice.bindings.http-5185.targetPort};{stress-apiservice.bindings.http-5186.targetPort};{stress-apiservice.bindings.http-5187.targetPort};{stress-apiservice.bindings.http-5188.targetPort};{stress-apiservice.bindings.http-5189.targetPort};{stress-apiservice.bindings.http-5190.targetPort};{stress-apiservice.bindings.http-5191.targetPort};{stress-apiservice.bindings.http-5192.targetPort};{stress-apiservice.bindings.http-5193.targetPort};{stress-apiservice.bindings.http-5194.targetPort};{stress-apiservice.bindings.http-5195.targetPort};{stress-apiservice.bindings.http-5196.targetPort};{stress-apiservice.bindings.http-5197.targetPort};{stress-apiservice.bindings.http-5198.targetPort};{stress-apiservice.bindings.http-5199.targetPort};{stress-apiservice.bindings.http-5200.targetPort};{stress-apiservice.bindings.http-5201.targetPort};{stress-apiservice.bindings.http-5202.targetPort};{stress-apiservice.bindings.http-5203.targetPort};{stress-apiservice.bindings.http-5204.targetPort};{stress-apiservice.bindings.http-5205.targetPort};{stress-apiservice.bindings.http-5206.targetPort};{stress-apiservice.bindings.http-5207.targetPort};{stress-apiservice.bindings.http-5208.targetPort};{stress-apiservice.bindings.http-5209.targetPort}"
"HTTP_PORTS": "{stress-apiservice.bindings.http.targetPort};{stress-apiservice.bindings.http-5181.targetPort};{stress-apiservice.bindings.http-5182.targetPort};{stress-apiservice.bindings.http-5183.targetPort};{stress-apiservice.bindings.http-5184.targetPort};{stress-apiservice.bindings.http-5185.targetPort};{stress-apiservice.bindings.http-5186.targetPort};{stress-apiservice.bindings.http-5187.targetPort};{stress-apiservice.bindings.http-5188.targetPort};{stress-apiservice.bindings.http-5189.targetPort};{stress-apiservice.bindings.http-5190.targetPort};{stress-apiservice.bindings.http-5191.targetPort};{stress-apiservice.bindings.http-5192.targetPort};{stress-apiservice.bindings.http-5193.targetPort};{stress-apiservice.bindings.http-5194.targetPort};{stress-apiservice.bindings.http-5195.targetPort};{stress-apiservice.bindings.http-5196.targetPort};{stress-apiservice.bindings.http-5197.targetPort};{stress-apiservice.bindings.http-5198.targetPort};{stress-apiservice.bindings.http-5199.targetPort};{stress-apiservice.bindings.http-5200.targetPort};{stress-apiservice.bindings.http-5201.targetPort};{stress-apiservice.bindings.http-5202.targetPort};{stress-apiservice.bindings.http-5203.targetPort};{stress-apiservice.bindings.http-5204.targetPort};{stress-apiservice.bindings.http-5205.targetPort};{stress-apiservice.bindings.http-5206.targetPort};{stress-apiservice.bindings.http-5207.targetPort};{stress-apiservice.bindings.http-5208.targetPort};{stress-apiservice.bindings.http-5209.targetPort};{stress-apiservice.bindings.http-5210.targetPort}"
},
"bindings": {
"http-5180": {
"http": {
"scheme": "http",
"protocol": "tcp",
"transport": "http",
Expand Down Expand Up @@ -220,6 +220,13 @@
"transport": "http",
"port": 5209,
"targetPort": 8028
},
"http-5210": {
"scheme": "http",
"protocol": "tcp",
"transport": "http",
"port": 5210,
"targetPort": 8029
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion playground/TestShop/TestShop.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"messaging": {
"type": "container.v0",
"connectionString": "amqp://guest:{messaging-password.value}@{messaging.bindings.tcp.host}:{messaging.bindings.tcp.port}",
"image": "docker.io/library/rabbitmq:3.13-management",
"image": "docker.io/library/rabbitmq:4.0-management",
"volumes": [
{
"name": "testshop.apphost-a23213a1a9-messaging-data",
Expand Down
10 changes: 5 additions & 5 deletions playground/bicep/BicepSample.AppHost/sb.module.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ resource topic1 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
parent: sb
}

resource topic2 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
name: 'topic2'
parent: sb
}

resource subscription1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
name: 'subscription1'
parent: topic1
Expand All @@ -56,6 +51,11 @@ resource subscription2 'Microsoft.ServiceBus/namespaces/topics/subscriptions@202
parent: topic1
}

resource topic2 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
name: 'topic2'
parent: sb
}

resource subscription1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
name: 'subscription1'
parent: topic2
Expand Down
18 changes: 9 additions & 9 deletions playground/cdk/CdkSample.AppHost/servicebus.module.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ resource topic1 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
parent: servicebus
}

resource topic2 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
name: 'topic2'
parent: servicebus
resource subscription2 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
name: 'subscription2'
parent: topic1
}

resource topic3 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
name: 'topic3'
resource topic2 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
name: 'topic2'
parent: servicebus
}

Expand All @@ -64,12 +64,12 @@ resource subscription1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@202
lockDuration: 'PT5M'
requiresSession: true
}
parent: topic1
parent: topic2
}

resource subscription2 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
name: 'subscription2'
parent: topic1
resource topic3 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
name: 'topic3'
parent: servicebus
}

resource sub1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
Expand Down
58 changes: 58 additions & 0 deletions playground/dapr/Dapr.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,29 @@
{
"$schema": "https://json.schemastore.org/aspire-8.0.json",
"resources": {
"rabbitMQ": {
"type": "container.v0",
"connectionString": "amqp://guest:{rabbitMQ-password.value}@{rabbitMQ.bindings.tcp.host}:{rabbitMQ.bindings.tcp.port}",
"image": "docker.io/library/rabbitmq:4.0-management",
"env": {
"RABBITMQ_DEFAULT_USER": "guest",
"RABBITMQ_DEFAULT_PASS": "{rabbitMQ-password.value}"
},
"bindings": {
"tcp": {
"scheme": "tcp",
"protocol": "tcp",
"transport": "tcp",
"targetPort": 5672
},
"management": {
"scheme": "http",
"protocol": "tcp",
"transport": "http",
"targetPort": 15672
}
}
},
"statestore": {
"type": "dapr.component.v0",
"daprComponent": {
Expand Down Expand Up @@ -79,6 +102,41 @@
"pubsub"
]
}
},
"servicec": {
"type": "project.v0",
"path": "../ServiceC/DaprServiceC.csproj",
"env": {
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES": "true",
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory"
}
},
"servicec-dapr": {
"type": "dapr.v0",
"dapr": {
"application": "servicec",
"appId": "servicec",
"components": [
"statestore"
]
}
},
"rabbitMQ-password": {
"type": "parameter.v0",
"value": "{rabbitMQ-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22,
"special": false
}
}
}
}
}
}
}
2 changes: 1 addition & 1 deletion playground/keycloak/Keycloak.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"resources": {
"keycloak": {
"type": "container.v0",
"image": "quay.io/keycloak/keycloak:25.0",
"image": "quay.io/keycloak/keycloak:26.0",
"args": [
"start",
"--import-realm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"milvus": {
"type": "container.v0",
"connectionString": "Endpoint={milvus.bindings.grpc.url};Key=root:{milvus-key.value}",
"image": "docker.io/milvusdb/milvus:v2.4.12",
"image": "docker.io/milvusdb/milvus:v2.4.13",
"args": [
"milvus",
"run",
Expand Down
2 changes: 1 addition & 1 deletion playground/mysql/MySqlDb.AppHost/aspire-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"mysql": {
"type": "container.v0",
"connectionString": "Server={mysql.bindings.tcp.host};Port={mysql.bindings.tcp.port};User ID=root;Password={mysql-password.value}",
"image": "docker.io/library/mysql:9.0",
"image": "docker.io/library/mysql:9.1",
"bindMounts": [
{
"source": "../MySql.ApiService/data",
Expand Down

0 comments on commit 9e9f374

Please sign in to comment.