Skip to content

Commit 9e9f374

Browse files
sebastienrossebastienros
authored
Update manifests (#7096)
1 parent 78837be commit 9e9f374

File tree

12 files changed

+184
-22
lines changed

12 files changed

+184
-22
lines changed

‎playground/AzureServiceBus/ServiceBus.AppHost/aspire-manifest.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"$schema": "https://json.schemastore.org/aspire-8.0.json",
3+
"resources": {
4+
"sbemulator": {
5+
"type": "azure.bicep.v0",
6+
"connectionString": "{sbemulator.outputs.serviceBusEndpoint}",
7+
"path": "sbemulator.module.bicep",
8+
"params": {
9+
"principalType": "",
10+
"principalId": ""
11+
}
12+
},
13+
"worker": {
14+
"type": "project.v0",
15+
"path": "../ServiceBusWorker/ServiceBusWorker.csproj",
16+
"env": {
17+
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
18+
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES": "true",
19+
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory",
20+
"ConnectionStrings__sbemulator": "{sbemulator.connectionString}"
21+
}
22+
}
23+
}
24+
}

‎playground/AzureServiceBus/ServiceBus.AppHost/sbemulator.module.bicep

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
@description('The location for the resource(s) to be deployed.')
2+
param location string = resourceGroup().location
3+
4+
param sku string = 'Standard'
5+
6+
param principalType string
7+
8+
param principalId string
9+
10+
resource sbemulator 'Microsoft.ServiceBus/namespaces@2024-01-01' = {
11+
name: take('sbemulator-${uniqueString(resourceGroup().id)}', 50)
12+
location: location
13+
properties: {
14+
disableLocalAuth: true
15+
}
16+
sku: {
17+
name: sku
18+
}
19+
tags: {
20+
'aspire-resource-name': 'sbemulator'
21+
}
22+
}
23+
24+
resource sbemulator_AzureServiceBusDataOwner 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
25+
name: guid(sbemulator.id, principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '090c5cfd-751d-490a-894a-3ce6f1109419'))
26+
properties: {
27+
principalId: principalId
28+
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '090c5cfd-751d-490a-894a-3ce6f1109419')
29+
principalType: principalType
30+
}
31+
scope: sbemulator
32+
}
33+
34+
resource queue1 'Microsoft.ServiceBus/namespaces/queues@2024-01-01' = {
35+
name: 'queue1'
36+
properties: {
37+
deadLetteringOnMessageExpiration: false
38+
}
39+
parent: sbemulator
40+
}
41+
42+
resource topic1 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
43+
name: 'topic1'
44+
parent: sbemulator
45+
}
46+
47+
resource sub1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
48+
name: 'sub1'
49+
properties: {
50+
maxDeliveryCount: 10
51+
}
52+
parent: topic1
53+
}
54+
55+
resource app_prop_filter_1 'Microsoft.ServiceBus/namespaces/topics/subscriptions/rules@2024-01-01' = {
56+
name: 'app-prop-filter-1'
57+
properties: {
58+
correlationFilter: {
59+
correlationId: 'id1'
60+
messageId: 'msgid1'
61+
to: 'xyz'
62+
replyTo: 'someQueue'
63+
label: 'subject1'
64+
sessionId: 'session1'
65+
replyToSessionId: 'sessionId'
66+
contentType: 'application/text'
67+
}
68+
filterType: 'CorrelationFilter'
69+
}
70+
parent: sub1
71+
}
72+
73+
output serviceBusEndpoint string = sbemulator.properties.serviceBusEndpoint

‎playground/Elasticsearch/Elasticsearch.AppHost/aspire-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"elasticsearch": {
55
"type": "container.v0",
66
"connectionString": "http://elastic:{elasticsearch-password.value}@{elasticsearch.bindings.http.host}:{elasticsearch.bindings.http.port}",
7-
"image": "docker.io/library/elasticsearch:8.15.2",
7+
"image": "docker.io/library/elasticsearch:8.15.3",
88
"volumes": [
99
{
1010
"name": "elasticsearch.apphost-93fd2337c1-elasticsearch-data",

‎playground/Qdrant/Qdrant.AppHost/aspire-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"qdrant": {
55
"type": "container.v0",
66
"connectionString": "Endpoint={qdrant.bindings.grpc.url};Key={qdrant-Key.value}",
7-
"image": "docker.io/qdrant/qdrant:v1.11.5",
7+
"image": "docker.io/qdrant/qdrant:v1.12.1",
88
"volumes": [
99
{
1010
"name": "qdrant-data",

‎playground/Stress/Stress.AppHost/aspire-manifest.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES": "true",
1010
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory",
1111
"ASPNETCORE_FORWARDEDHEADERS_ENABLED": "true",
12-
"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}"
12+
"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}"
1313
},
1414
"bindings": {
15-
"http-5180": {
15+
"http": {
1616
"scheme": "http",
1717
"protocol": "tcp",
1818
"transport": "http",
@@ -220,6 +220,13 @@
220220
"transport": "http",
221221
"port": 5209,
222222
"targetPort": 8028
223+
},
224+
"http-5210": {
225+
"scheme": "http",
226+
"protocol": "tcp",
227+
"transport": "http",
228+
"port": 5210,
229+
"targetPort": 8029
223230
}
224231
}
225232
},

‎playground/TestShop/TestShop.AppHost/aspire-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
"messaging": {
108108
"type": "container.v0",
109109
"connectionString": "amqp://guest:{messaging-password.value}@{messaging.bindings.tcp.host}:{messaging.bindings.tcp.port}",
110-
"image": "docker.io/library/rabbitmq:3.13-management",
110+
"image": "docker.io/library/rabbitmq:4.0-management",
111111
"volumes": [
112112
{
113113
"name": "testshop.apphost-a23213a1a9-messaging-data",

‎playground/bicep/BicepSample.AppHost/sb.module.bicep

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ resource topic1 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
4141
parent: sb
4242
}
4343

44-
resource topic2 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
45-
name: 'topic2'
46-
parent: sb
47-
}
48-
4944
resource subscription1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
5045
name: 'subscription1'
5146
parent: topic1
@@ -56,6 +51,11 @@ resource subscription2 'Microsoft.ServiceBus/namespaces/topics/subscriptions@202
5651
parent: topic1
5752
}
5853

54+
resource topic2 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
55+
name: 'topic2'
56+
parent: sb
57+
}
58+
5959
resource subscription1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
6060
name: 'subscription1'
6161
parent: topic2

‎playground/cdk/CdkSample.AppHost/servicebus.module.bicep

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ resource topic1 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
4848
parent: servicebus
4949
}
5050

51-
resource topic2 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
52-
name: 'topic2'
53-
parent: servicebus
51+
resource subscription2 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
52+
name: 'subscription2'
53+
parent: topic1
5454
}
5555

56-
resource topic3 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
57-
name: 'topic3'
56+
resource topic2 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
57+
name: 'topic2'
5858
parent: servicebus
5959
}
6060

@@ -64,12 +64,12 @@ resource subscription1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@202
6464
lockDuration: 'PT5M'
6565
requiresSession: true
6666
}
67-
parent: topic1
67+
parent: topic2
6868
}
6969

70-
resource subscription2 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {
71-
name: 'subscription2'
72-
parent: topic1
70+
resource topic3 'Microsoft.ServiceBus/namespaces/topics@2024-01-01' = {
71+
name: 'topic3'
72+
parent: servicebus
7373
}
7474

7575
resource sub1 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2024-01-01' = {

‎playground/dapr/Dapr.AppHost/aspire-manifest.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
{
22
"$schema": "https://json.schemastore.org/aspire-8.0.json",
33
"resources": {
4+
"rabbitMQ": {
5+
"type": "container.v0",
6+
"connectionString": "amqp://guest:{rabbitMQ-password.value}@{rabbitMQ.bindings.tcp.host}:{rabbitMQ.bindings.tcp.port}",
7+
"image": "docker.io/library/rabbitmq:4.0-management",
8+
"env": {
9+
"RABBITMQ_DEFAULT_USER": "guest",
10+
"RABBITMQ_DEFAULT_PASS": "{rabbitMQ-password.value}"
11+
},
12+
"bindings": {
13+
"tcp": {
14+
"scheme": "tcp",
15+
"protocol": "tcp",
16+
"transport": "tcp",
17+
"targetPort": 5672
18+
},
19+
"management": {
20+
"scheme": "http",
21+
"protocol": "tcp",
22+
"transport": "http",
23+
"targetPort": 15672
24+
}
25+
}
26+
},
427
"statestore": {
528
"type": "dapr.component.v0",
629
"daprComponent": {
@@ -79,6 +102,41 @@
79102
"pubsub"
80103
]
81104
}
105+
},
106+
"servicec": {
107+
"type": "project.v0",
108+
"path": "../ServiceC/DaprServiceC.csproj",
109+
"env": {
110+
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
111+
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES": "true",
112+
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory"
113+
}
114+
},
115+
"servicec-dapr": {
116+
"type": "dapr.v0",
117+
"dapr": {
118+
"application": "servicec",
119+
"appId": "servicec",
120+
"components": [
121+
"statestore"
122+
]
123+
}
124+
},
125+
"rabbitMQ-password": {
126+
"type": "parameter.v0",
127+
"value": "{rabbitMQ-password.inputs.value}",
128+
"inputs": {
129+
"value": {
130+
"type": "string",
131+
"secret": true,
132+
"default": {
133+
"generate": {
134+
"minLength": 22,
135+
"special": false
136+
}
137+
}
138+
}
139+
}
82140
}
83141
}
84142
}

‎playground/keycloak/Keycloak.AppHost/aspire-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"resources": {
44
"keycloak": {
55
"type": "container.v0",
6-
"image": "quay.io/keycloak/keycloak:25.0",
6+
"image": "quay.io/keycloak/keycloak:26.0",
77
"args": [
88
"start",
99
"--import-realm"

‎playground/milvus/MilvusPlayground.AppHost/aspire-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"milvus": {
55
"type": "container.v0",
66
"connectionString": "Endpoint={milvus.bindings.grpc.url};Key=root:{milvus-key.value}",
7-
"image": "docker.io/milvusdb/milvus:v2.4.12",
7+
"image": "docker.io/milvusdb/milvus:v2.4.13",
88
"args": [
99
"milvus",
1010
"run",

‎playground/mysql/MySqlDb.AppHost/aspire-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"mysql": {
55
"type": "container.v0",
66
"connectionString": "Server={mysql.bindings.tcp.host};Port={mysql.bindings.tcp.port};User ID=root;Password={mysql-password.value}",
7-
"image": "docker.io/library/mysql:9.0",
7+
"image": "docker.io/library/mysql:9.1",
88
"bindMounts": [
99
{
1010
"source": "../MySql.ApiService/data",

0 commit comments

Comments
 (0)