Skip to content

Commit ee7ef1d

Browse files
[Automated] Update Playground Manifests (#10249)
Co-authored-by: davidfowl <[email protected]>
1 parent 2b95fae commit ee7ef1d

File tree

8 files changed

+119
-41
lines changed

8 files changed

+119
-41
lines changed

playground/ExternalServices/ExternalServices.AppHost/aspire-manifest.json

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"gateway": {
1414
"type": "container.v0",
15-
"image": "mcr.microsoft.com/dotnet/nightly/yarp:2.3.0-preview.3",
15+
"image": "mcr.microsoft.com/dotnet/nightly/yarp:2.3.0-preview.4",
1616
"entrypoint": "dotnet",
1717
"args": [
1818
"/app/yarp.dll"
@@ -41,29 +41,4 @@
4141
},
4242
"frontend": {
4343
"type": "project.v0",
44-
"path": "../WebFrontEnd/WebFrontEnd.csproj",
45-
"env": {
46-
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
47-
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES": "true",
48-
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory",
49-
"ASPNETCORE_FORWARDEDHEADERS_ENABLED": "true",
50-
"HTTP_PORTS": "{frontend.bindings.http.targetPort}",
51-
"services__nuget__https__0": "https://api.nuget.org/",
52-
"EXTERNAL_SERVICE_URL": "{external-service-url.value}",
53-
"services__gateway__http__0": "{gateway.bindings.http.url}"
54-
},
55-
"bindings": {
56-
"http": {
57-
"scheme": "http",
58-
"protocol": "tcp",
59-
"transport": "http"
60-
},
61-
"https": {
62-
"scheme": "https",
63-
"protocol": "tcp",
64-
"transport": "http"
65-
}
66-
}
67-
}
68-
}
69-
}
44+
"path": "../WebFrontEnd/WebFrontEnd.csproj"

playground/GitHubModelsEndToEnd/GitHubModelsEndToEnd.AppHost/aspire-manifest.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
"userPrincipalId": ""
99
}
1010
},
11-
"chat": {
12-
"type": "value.v0",
13-
"connectionString": "Endpoint=https://models.github.ai/inference;Key={github-api-key.value};Model=openai/gpt-4o-mini;DeploymentId=openai/gpt-4o-mini"
14-
},
15-
"github-api-key": {
11+
"chat-gh-apikey": {
1612
"type": "parameter.v0",
17-
"value": "{github-api-key.inputs.value}",
13+
"value": "{chat-gh-apikey.inputs.value}",
1814
"inputs": {
1915
"value": {
2016
"type": "string",
2117
"secret": true
2218
}
2319
}
2420
},
21+
"chat": {
22+
"type": "value.v0",
23+
"connectionString": "Endpoint=https://models.github.ai/inference;Key={chat-gh-apikey.value};Model=openai/gpt-4o-mini;DeploymentId=openai/gpt-4o-mini"
24+
},
2525
"webstory": {
2626
"type": "project.v1",
2727
"path": "../GitHubModelsEndToEnd.WebStory/GitHubModelsEndToEnd.WebStory.csproj",
@@ -35,7 +35,7 @@
3535
"env_outputs_azure_container_registry_managed_identity_id": "{env.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
3636
"webstory_containerimage": "{webstory.containerImage}",
3737
"webstory_containerport": "{webstory.containerPort}",
38-
"github_api_key_value": "{github-api-key.value}"
38+
"chat_gh_apikey_value": "{chat-gh-apikey.value}"
3939
}
4040
},
4141
"env": {

playground/GitHubModelsEndToEnd/GitHubModelsEndToEnd.AppHost/webstory.module.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ param webstory_containerimage string
1414
param webstory_containerport string
1515

1616
@secure()
17-
param github_api_key_value string
17+
param chat_gh_apikey_value string
1818

1919
resource webstory 'Microsoft.App/containerApps@2025-02-02-preview' = {
2020
name: 'webstory'
@@ -24,7 +24,7 @@ resource webstory 'Microsoft.App/containerApps@2025-02-02-preview' = {
2424
secrets: [
2525
{
2626
name: 'connectionstrings--chat'
27-
value: 'Endpoint=https://models.github.ai/inference;Key=${github_api_key_value};Model=openai/gpt-4o-mini;DeploymentId=openai/gpt-4o-mini'
27+
value: 'Endpoint=https://models.github.ai/inference;Key=${chat_gh_apikey_value};Model=openai/gpt-4o-mini;DeploymentId=openai/gpt-4o-mini'
2828
}
2929
]
3030
activeRevisionsMode: 'Single'

playground/ParameterEndToEnd/ParameterEndToEnd.AppHost/aspire-manifest.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,55 @@
2929
"type": "value.v0",
3030
"connectionString": "sql={db.connectionString};rows={insertionrows.value}"
3131
},
32+
"parameterFromConnectionStringConfig": {
33+
"type": "parameter.v0",
34+
"connectionString": "{parameterFromConnectionStringConfig.value}",
35+
"value": "{parameterFromConnectionStringConfig.inputs.value}",
36+
"inputs": {
37+
"value": {
38+
"type": "string",
39+
"secret": true
40+
}
41+
}
42+
},
43+
"throwing": {
44+
"type": "parameter.v0",
45+
"value": "{throwing.inputs.value}",
46+
"inputs": {
47+
"value": {
48+
"type": "string"
49+
}
50+
}
51+
},
52+
"parameterFromConnectionStringConfigMissing": {
53+
"type": "parameter.v0",
54+
"connectionString": "{parameterFromConnectionStringConfigMissing.value}",
55+
"value": "{parameterFromConnectionStringConfigMissing.inputs.value}",
56+
"inputs": {
57+
"value": {
58+
"type": "string",
59+
"secret": true
60+
}
61+
}
62+
},
63+
"markdownDescription": {
64+
"type": "parameter.v0",
65+
"value": "{markdownDescription.inputs.value}",
66+
"inputs": {
67+
"value": {
68+
"type": "string"
69+
}
70+
}
71+
},
72+
"customInput": {
73+
"type": "parameter.v0",
74+
"value": "{customInput.inputs.value}",
75+
"inputs": {
76+
"value": {
77+
"type": "string"
78+
}
79+
}
80+
},
3281
"api": {
3382
"type": "project.v0",
3483
"path": "../ParameterEndToEnd.ApiService/ParameterEndToEnd.ApiService.csproj",

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,31 @@
257257
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory"
258258
}
259259
},
260+
"executableWithSingleArg": {
261+
"type": "executable.v0",
262+
"workingDirectory": ".",
263+
"command": "dotnet",
264+
"args": [
265+
"--version"
266+
]
267+
},
268+
"executableWithSingleEscapedArg": {
269+
"type": "executable.v0",
270+
"workingDirectory": ".",
271+
"command": "dotnet",
272+
"args": [
273+
"one two"
274+
]
275+
},
276+
"executableWithMultipleArgs": {
277+
"type": "executable.v0",
278+
"workingDirectory": ".",
279+
"command": "dotnet",
280+
"args": [
281+
"--version",
282+
"one two"
283+
]
284+
},
260285
"empty-0000": {
261286
"type": "project.v0",
262287
"path": "../Stress.Empty/Stress.Empty.csproj",

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,23 @@
203203
},
204204
"apigateway": {
205205
"type": "container.v0",
206-
"image": "mcr.microsoft.com/dotnet/nightly/yarp:latest",
206+
"image": "mcr.microsoft.com/dotnet/nightly/yarp:2.3.0-preview.4",
207+
"entrypoint": "dotnet",
208+
"args": [
209+
"/app/yarp.dll"
210+
],
207211
"env": {
208-
"ASPNETCORE_ENVIRONMENT": "Development"
212+
"ASPNETCORE_ENVIRONMENT": "Development",
213+
"services__catalogservice__http__0": "{catalogservice.bindings.http.url}",
214+
"REVERSEPROXY__ROUTES__route0__MATCH__PATH": "/catalog/{**catch-all}",
215+
"REVERSEPROXY__ROUTES__route0__CLUSTERID": "cluster_catalogservice",
216+
"REVERSEPROXY__ROUTES__route0__TRANSFORMS__0__PathRemovePrefix": "/catalog",
217+
"REVERSEPROXY__ROUTES__route1__MATCH__PATH": "/basket/{**catch-all}",
218+
"REVERSEPROXY__ROUTES__route1__CLUSTERID": "cluster_basketservice",
219+
"REVERSEPROXY__ROUTES__route1__TRANSFORMS__0__PathRemovePrefix": "/basket",
220+
"REVERSEPROXY__CLUSTERS__cluster_catalogservice__DESTINATIONS__destination1__ADDRESS": "http://_http.catalogservice",
221+
"REVERSEPROXY__CLUSTERS__cluster_basketservice__DESTINATIONS__destination1__ADDRESS": "http://_http.basketservice",
222+
"services__basketservice__http__0": "{basketservice.bindings.http.url}"
209223
},
210224
"bindings": {
211225
"http": {

playground/cdk/CdkSample.AppHost/sql-roles.module.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ resource script_sql_sqldb 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
3434
}
3535
kind: 'AzurePowerShell'
3636
properties: {
37-
scriptContent: '\$sqlServerFqdn = "\$env:DBSERVER"\r\n\$sqlDatabaseName = "\$env:DBNAME"\r\n\$principalName = "\$env:PRINCIPALNAME"\r\n\$id = "\$env:ID"\r\n\r\n# Install SqlServer module - using specific version to avoid breaking changes in 22.4.5.1 (see https://github.com/dotnet/aspire/issues/9926)\r\nInstall-Module -Name SqlServer -RequiredVersion 22.3.0 -Force -AllowClobber -Scope CurrentUser\r\nImport-Module SqlServer\r\n\r\n\$sqlCmd = @"\r\nDECLARE @name SYSNAME = \'\$principalName\';\r\nDECLARE @id UNIQUEIDENTIFIER = \'\$id\';\r\n\r\n-- Convert the guid to the right type\r\nDECLARE @castId NVARCHAR(MAX) = CONVERT(VARCHAR(MAX), CONVERT (VARBINARY(16), @id), 1);\r\n\r\n-- Construct command: CREATE USER [@name] WITH SID = @castId, TYPE = E;\r\nDECLARE @cmd NVARCHAR(MAX) = N\'CREATE USER [\' + @name + \'] WITH SID = \' + @castId + \', TYPE = E;\'\r\nEXEC (@cmd);\r\n\r\n-- Assign roles to the new user\r\nDECLARE @role1 NVARCHAR(MAX) = N\'ALTER ROLE db_owner ADD MEMBER [\' + @name + \']\';\r\nEXEC (@role1);\r\n\r\n"@\r\n# Note: the string terminator must not have whitespace before it, therefore it is not indented.\r\n\r\nWrite-Host \$sqlCmd\r\n\r\n\$connectionString = "Server=tcp:\${sqlServerFqdn},1433;Initial Catalog=\${sqlDatabaseName};Authentication=Active Directory Default;"\r\n\r\nInvoke-Sqlcmd -ConnectionString \$connectionString -Query \$sqlCmd'
3837
azPowerShellVersion: '10.0'
3938
retentionInterval: 'PT1H'
4039
environmentVariables: [
@@ -59,5 +58,6 @@ resource script_sql_sqldb 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
5958
value: mi.properties.clientId
6059
}
6160
]
61+
scriptContent: '\$sqlServerFqdn = "\$env:DBSERVER"\r\n\$sqlDatabaseName = "\$env:DBNAME"\r\n\$principalName = "\$env:PRINCIPALNAME"\r\n\$id = "\$env:ID"\r\n\r\n# Install SqlServer module - using specific version to avoid breaking changes in 22.4.5.1 (see https://github.com/dotnet/aspire/issues/9926)\r\nInstall-Module -Name SqlServer -RequiredVersion 22.3.0 -Force -AllowClobber -Scope CurrentUser\r\nImport-Module SqlServer\r\n\r\n\$sqlCmd = @"\r\nDECLARE @name SYSNAME = \'\$principalName\';\r\nDECLARE @id UNIQUEIDENTIFIER = \'\$id\';\r\n\r\n-- Convert the guid to the right type\r\nDECLARE @castId NVARCHAR(MAX) = CONVERT(VARCHAR(MAX), CONVERT (VARBINARY(16), @id), 1);\r\n\r\n-- Construct command: CREATE USER [@name] WITH SID = @castId, TYPE = E;\r\nDECLARE @cmd NVARCHAR(MAX) = N\'CREATE USER [\' + @name + \'] WITH SID = \' + @castId + \', TYPE = E;\'\r\nEXEC (@cmd);\r\n\r\n-- Assign roles to the new user\r\nDECLARE @role1 NVARCHAR(MAX) = N\'ALTER ROLE db_owner ADD MEMBER [\' + @name + \']\';\r\nEXEC (@role1);\r\n\r\n"@\r\n# Note: the string terminator must not have whitespace before it, therefore it is not indented.\r\n\r\nWrite-Host \$sqlCmd\r\n\r\n\$connectionString = "Server=tcp:\${sqlServerFqdn},1433;Initial Catalog=\${sqlDatabaseName};Authentication=Active Directory Default;"\r\n\r\nInvoke-Sqlcmd -ConnectionString \$connectionString -Query \$sqlCmd'
6262
}
6363
}

playground/yarp/Yarp.AppHost/aspire-manifest.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,24 @@
4949
},
5050
"gateway": {
5151
"type": "container.v0",
52-
"image": "mcr.microsoft.com/dotnet/nightly/yarp:latest",
52+
"image": "mcr.microsoft.com/dotnet/nightly/yarp:2.3.0-preview.4",
53+
"entrypoint": "dotnet",
54+
"args": [
55+
"/app/yarp.dll"
56+
],
5357
"env": {
54-
"ASPNETCORE_ENVIRONMENT": "Development"
58+
"ASPNETCORE_ENVIRONMENT": "Development",
59+
"services__frontend__http__0": "{frontend.bindings.http.url}",
60+
"REVERSEPROXY__ROUTES__route0__MATCH__PATH": "/{**catchall}",
61+
"REVERSEPROXY__ROUTES__route0__CLUSTERID": "cluster_frontend",
62+
"REVERSEPROXY__ROUTES__route1__MATCH__PATH": "/api/{**catch-all}",
63+
"REVERSEPROXY__ROUTES__route1__CLUSTERID": "cluster_backend",
64+
"REVERSEPROXY__ROUTES__route1__TRANSFORMS__0__PathRemovePrefix": "/api",
65+
"REVERSEPROXY__CLUSTERS__cluster_frontend__DESTINATIONS__destination1__ADDRESS": "https\u002Bhttp://frontend",
66+
"REVERSEPROXY__CLUSTERS__cluster_backend__DESTINATIONS__destination1__ADDRESS": "https\u002Bhttp://backend",
67+
"services__frontend__https__0": "{frontend.bindings.https.url}",
68+
"services__backend__http__0": "{backend.bindings.http.url}",
69+
"services__backend__https__0": "{backend.bindings.https.url}"
5570
},
5671
"bindings": {
5772
"http": {

0 commit comments

Comments
 (0)