Skip to content

Commit cc3d20f

Browse files
[Automated] Update Playground Manifests (#12520)
Co-authored-by: davidfowl <[email protected]>
1 parent 8e2e80c commit cc3d20f

File tree

25 files changed

+138
-59
lines changed

25 files changed

+138
-59
lines changed

playground/AzureAppService/AzureAppService.AppHost/infra.module.bicep

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ resource infra_asplan 'Microsoft.Web/serverfarms@2024-11-01' = {
3434
name: take('infraasplan-${uniqueString(resourceGroup().id)}', 60)
3535
location: location
3636
properties: {
37+
elasticScaleEnabled: false
3738
perSiteScaling: true
3839
reserved: true
40+
maximumElasticWorkerCount: 10
3941
}
4042
kind: 'Linux'
4143
sku: {
@@ -113,6 +115,8 @@ resource dashboard 'Microsoft.Web/sites@2024-11-01' = {
113115
alwaysOn: true
114116
http20Enabled: true
115117
http20ProxyFlag: 1
118+
functionAppScaleLimit: 1
119+
elasticWebAppScaleLimit: 1
116120
}
117121
}
118122
identity: {

playground/AzureContainerApps/AzureContainerApps.AppHost/api-containerapp.module.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ param infra_outputs_azure_container_apps_environment_default_domain string
55

66
param infra_outputs_azure_container_apps_environment_id string
77

8-
param infra_outputs_azure_container_registry_endpoint string
9-
10-
param infra_outputs_azure_container_registry_managed_identity_id string
11-
128
param api_containerimage string
139

1410
param api_identity_outputs_id string
@@ -33,6 +29,10 @@ param certificateName string
3329

3430
param customDomain string
3531

32+
param infra_outputs_azure_container_registry_endpoint string
33+
34+
param infra_outputs_azure_container_registry_managed_identity_id string
35+
3636
resource account_kv 'Microsoft.KeyVault/vaults@2024-11-01' existing = {
3737
name: account_kv_outputs_name
3838
}

playground/AzureContainerApps/AzureContainerApps.AppHost/pythonapp-containerapp.module.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ param infra_outputs_azure_container_apps_environment_default_domain string
55

66
param infra_outputs_azure_container_apps_environment_id string
77

8+
param pythonapp_containerimage string
9+
810
param infra_outputs_azure_container_registry_endpoint string
911

1012
param infra_outputs_azure_container_registry_managed_identity_id string
1113

12-
param pythonapp_containerimage string
13-
1414
resource pythonapp 'Microsoft.App/containerApps@2025-01-01' = {
1515
name: 'pythonapp'
1616
location: location

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.AppHost/apiservice-containerapp.module.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ param env_outputs_azure_container_apps_environment_default_domain string
55

66
param env_outputs_azure_container_apps_environment_id string
77

8-
param env_outputs_azure_container_registry_endpoint string
9-
10-
param env_outputs_azure_container_registry_managed_identity_id string
11-
128
param apiservice_containerimage string
139

1410
param apiservice_identity_outputs_id string
@@ -27,6 +23,10 @@ param storage_outputs_blobendpoint string
2723

2824
param apiservice_identity_outputs_clientid string
2925

26+
param env_outputs_azure_container_registry_endpoint string
27+
28+
param env_outputs_azure_container_registry_managed_identity_id string
29+
3030
resource apiservice 'Microsoft.App/containerApps@2025-02-02-preview' = {
3131
name: 'apiservice'
3232
location: location

playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.AppHost/funcapp-containerapp.module.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ param env_outputs_azure_container_apps_environment_default_domain string
55

66
param env_outputs_azure_container_apps_environment_id string
77

8-
param env_outputs_azure_container_registry_endpoint string
9-
10-
param env_outputs_azure_container_registry_managed_identity_id string
11-
128
param funcapp_containerimage string
139

1410
param funcapp_identity_outputs_id string
@@ -31,6 +27,10 @@ param storage_outputs_queueendpoint string
3127

3228
param funcapp_identity_outputs_clientid string
3329

30+
param env_outputs_azure_container_registry_endpoint string
31+
32+
param env_outputs_azure_container_registry_managed_identity_id string
33+
3434
resource funcapp 'Microsoft.App/containerApps@2025-02-02-preview' = {
3535
name: 'funcapp'
3636
location: location

playground/AzureKusto/AzureKusto.AppHost/worker-containerapp.module.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ param infra_outputs_azure_container_apps_environment_default_domain string
55

66
param infra_outputs_azure_container_apps_environment_id string
77

8-
param infra_outputs_azure_container_registry_endpoint string
9-
10-
param infra_outputs_azure_container_registry_managed_identity_id string
11-
128
param worker_containerimage string
139

1410
param worker_identity_outputs_id string
@@ -17,6 +13,10 @@ param kusto_outputs_clusteruri string
1713

1814
param worker_identity_outputs_clientid string
1915

16+
param infra_outputs_azure_container_registry_endpoint string
17+
18+
param infra_outputs_azure_container_registry_managed_identity_id string
19+
2020
resource worker 'Microsoft.App/containerApps@2025-02-02-preview' = {
2121
name: 'worker'
2222
location: location

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"DB1_PORT": "{sql1.bindings.tcp.port}",
3737
"DB1_USERNAME": "sa",
3838
"DB1_PASSWORD": "{sql1-password.value}",
39-
"DB1_JDBCCONNECTIONSTRING": "jdbc:sqlserver://{sql1.bindings.tcp.host}:{sql1.bindings.tcp.port};user=sa;password={sql1-password-uri-encoded.value};databaseName=db1;trustServerCertificate=true",
39+
"DB1_URI": "mssql://{sql1.bindings.tcp.host}:{sql1.bindings.tcp.port}/db1",
40+
"DB1_JDBCCONNECTIONSTRING": "jdbc:sqlserver://{sql1.bindings.tcp.host}:{sql1.bindings.tcp.port};trustServerCertificate=true;databaseName=db1",
4041
"DB1_DATABASE": "db1"
4142
},
4243
"bindings": {
@@ -66,7 +67,8 @@
6667
"DB1_PORT": "{sql1.bindings.tcp.port}",
6768
"DB1_USERNAME": "sa",
6869
"DB1_PASSWORD": "{sql1-password.value}",
69-
"DB1_JDBCCONNECTIONSTRING": "jdbc:sqlserver://{sql1.bindings.tcp.host}:{sql1.bindings.tcp.port};user=sa;password={sql1-password-uri-encoded.value};databaseName=db1;trustServerCertificate=true",
70+
"DB1_URI": "mssql://{sql1.bindings.tcp.host}:{sql1.bindings.tcp.port}/db1",
71+
"DB1_JDBCCONNECTIONSTRING": "jdbc:sqlserver://{sql1.bindings.tcp.host}:{sql1.bindings.tcp.port};trustServerCertificate=true;databaseName=db1",
7072
"DB1_DATABASE": "db1"
7173
}
7274
},
@@ -87,11 +89,6 @@
8789
}
8890
}
8991
}
90-
},
91-
"sql1-password-uri-encoded": {
92-
"type": "annotated.string",
93-
"value": "{sql1-password.value}",
94-
"filter": "uri"
9592
}
9693
}
9794
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ param env_outputs_azure_container_apps_environment_default_domain string
55

66
param env_outputs_azure_container_apps_environment_id string
77

8-
param env_outputs_azure_container_registry_endpoint string
9-
10-
param env_outputs_azure_container_registry_managed_identity_id string
11-
128
param webstory_containerimage string
139

1410
param webstory_containerport string
1511

1612
@secure()
1713
param chat_gh_apikey_value string
1814

15+
param env_outputs_azure_container_registry_endpoint string
16+
17+
param env_outputs_azure_container_registry_managed_identity_id string
18+
1919
resource webstory 'Microsoft.App/containerApps@2025-02-02-preview' = {
2020
name: 'webstory'
2121
location: location

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"oracle": {
55
"type": "container.v0",
66
"connectionString": "user id=system;password={oracle-password.value};data source={oracle.bindings.tcp.host}:{oracle.bindings.tcp.port}",
7-
"image": "container-registry.oracle.com/database/free:23.9.0.0",
7+
"image": "container-registry.oracle.com/database/free:23.26.0.0",
88
"env": {
99
"ORACLE_PWD": "{oracle-password.value}"
1010
},
@@ -35,7 +35,8 @@
3535
"FREEPDB1_PORT": "{oracle.bindings.tcp.port}",
3636
"FREEPDB1_USERNAME": "system",
3737
"FREEPDB1_PASSWORD": "{oracle-password.value}",
38-
"FREEPDB1_JDBCCONNECTIONSTRING": "jdbc:oracle:thin:system/{oracle-password-uri-encoded.value}@//{oracle.bindings.tcp.host}:{oracle.bindings.tcp.port}/FREEPDB1",
38+
"FREEPDB1_URI": "oracle://system:{oracle-password-uri-encoded.value}@{oracle.bindings.tcp.host}:{oracle.bindings.tcp.port}/FREEPDB1",
39+
"FREEPDB1_JDBCCONNECTIONSTRING": "jdbc:oracle:thin:@//{oracle.bindings.tcp.host}:{oracle.bindings.tcp.port}/FREEPDB1",
3940
"FREEPDB1_DATABASE": "FREEPDB1"
4041
},
4142
"bindings": {

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@
9494
"DB_PORT": "{sql.bindings.tcp.port}",
9595
"DB_USERNAME": "sa",
9696
"DB_PASSWORD": "{sql-password.value}",
97-
"DB_JDBCCONNECTIONSTRING": "jdbc:sqlserver://{sql.bindings.tcp.host}:{sql.bindings.tcp.port};user=sa;password={sql-password-uri-encoded.value};databaseName=db;trustServerCertificate=true",
97+
"DB_URI": "mssql://{sql.bindings.tcp.host}:{sql.bindings.tcp.port}/db",
98+
"DB_JDBCCONNECTIONSTRING": "jdbc:sqlserver://{sql.bindings.tcp.host}:{sql.bindings.tcp.port};trustServerCertificate=true;databaseName=db",
9899
"DB_DATABASE": "db"
99100
},
100101
"bindings": {
@@ -129,11 +130,6 @@
129130
}
130131
}
131132
}
132-
},
133-
"sql-password-uri-encoded": {
134-
"type": "annotated.string",
135-
"value": "{sql-password.value}",
136-
"filter": "uri"
137133
}
138134
}
139135
}

0 commit comments

Comments
 (0)