Skip to content

Commit 6a9540c

Browse files
eerhardteerhardt
authored
Revert redis password change (dotnet#7518)
* Revert "Follow up from Redis Password change (dotnet#7356)" This reverts commit ac76241. * Revert "Add Password To Redis (dotnet#4642)" This reverts commit 7d221ef. * Remove unnecessary using * Revert unnecessary changes
1 parent c2c5403 commit 6a9540c

File tree

16 files changed

+54
-487
lines changed

16 files changed

+54
-487
lines changed

‎playground/AspireEventHub/EventHubs.AppHost/aspire-manifest.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@
2222
"principalId": ""
2323
}
2424
},
25+
"eventhub": {
26+
"type": "value.v0",
27+
"connectionString": "Endpoint={eventhubns.outputs.eventHubsEndpoint};EntityPath=eventhub"
28+
},
2529
"consumer": {
2630
"type": "project.v0",
2731
"path": "../EventHubsConsumer/EventHubsConsumer.csproj",
2832
"env": {
2933
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES": "true",
3034
"OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES": "true",
3135
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory",
32-
"ConnectionStrings__eventhubns": "{eventhubns.connectionString}",
36+
"ConnectionStrings__eventhub": "{eventhub.connectionString}",
3337
"ConnectionStrings__checkpoints": "{checkpoints.connectionString}"
3438
}
3539
},
@@ -42,7 +46,7 @@
4246
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory",
4347
"ASPNETCORE_FORWARDEDHEADERS_ENABLED": "true",
4448
"HTTP_PORTS": "{api.bindings.http.targetPort}",
45-
"ConnectionStrings__eventhubns": "{eventhubns.connectionString}"
49+
"ConnectionStrings__eventhub": "{eventhub.connectionString}"
4650
},
4751
"bindings": {
4852
"http": {

‎playground/AspireEventHub/EventHubs.AppHost/eventhubns.module.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ resource eventhubns_AzureEventHubsDataOwner 'Microsoft.Authorization/roleAssignm
2828
scope: eventhubns
2929
}
3030

31-
resource hub 'Microsoft.EventHub/namespaces/eventhubs@2024-01-01' = {
32-
name: 'hub'
31+
resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2024-01-01' = {
32+
name: 'eventhub'
3333
parent: eventhubns
3434
}
3535

‎playground/AzureContainerApps/AzureContainerApps.AppHost/api.module.bicep

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ param api_containerport string
55

66
param storage_outputs_blobendpoint string
77

8-
@secure()
9-
param cache_password_value string
10-
118
param account_outputs_connectionstring string
129

1310
@secure()
@@ -33,10 +30,6 @@ resource api 'Microsoft.App/containerApps@2024-03-01' = {
3330
properties: {
3431
configuration: {
3532
secrets: [
36-
{
37-
name: 'connectionstrings--cache'
38-
value: 'cache:6379,password=${cache_password_value}'
39-
}
4033
{
4134
name: 'value'
4235
value: secretparam_value
@@ -95,7 +88,7 @@ resource api 'Microsoft.App/containerApps@2024-03-01' = {
9588
}
9689
{
9790
name: 'ConnectionStrings__cache'
98-
secretRef: 'connectionstrings--cache'
91+
value: 'cache:6379'
9992
}
10093
{
10194
name: 'ConnectionStrings__account'

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"cache": {
3333
"type": "container.v1",
34-
"connectionString": "{cache.bindings.tcp.host}:{cache.bindings.tcp.port},password={cache-password.value}",
34+
"connectionString": "{cache.bindings.tcp.host}:{cache.bindings.tcp.port}",
3535
"image": "docker.io/library/redis:7.4",
3636
"deployment": {
3737
"type": "azure.bicep.v0",
@@ -40,13 +40,10 @@
4040
"cache_volumes_0_storage": "{cache.volumes.0.storage}",
4141
"outputs_azure_container_registry_managed_identity_id": "{.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
4242
"outputs_managed_identity_client_id": "{.outputs.MANAGED_IDENTITY_CLIENT_ID}",
43-
"cache_password_value": "{cache-password.value}",
4443
"outputs_azure_container_apps_environment_id": "{.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}"
4544
}
4645
},
4746
"args": [
48-
"--requirepass",
49-
"{cache-password.value}",
5047
"--save",
5148
"60",
5249
"1"
@@ -119,7 +116,6 @@
119116
"params": {
120117
"api_containerport": "{api.containerPort}",
121118
"storage_outputs_blobendpoint": "{storage.outputs.blobEndpoint}",
122-
"cache_password_value": "{cache-password.value}",
123119
"account_outputs_connectionstring": "{account.outputs.connectionString}",
124120
"secretparam_value": "{secretparam.value}",
125121
"outputs_azure_container_registry_managed_identity_id": "{.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
@@ -156,21 +152,6 @@
156152
"external": true
157153
}
158154
}
159-
},
160-
"cache-password": {
161-
"type": "parameter.v0",
162-
"value": "{cache-password.inputs.value}",
163-
"inputs": {
164-
"value": {
165-
"type": "string",
166-
"secret": true,
167-
"default": {
168-
"generate": {
169-
"minLength": 22
170-
}
171-
}
172-
}
173-
}
174155
}
175156
}
176157
}

‎playground/AzureContainerApps/AzureContainerApps.AppHost/cache.module.bicep

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ param outputs_azure_container_registry_managed_identity_id string
77

88
param outputs_managed_identity_client_id string
99

10-
@secure()
11-
param cache_password_value string
12-
1310
param outputs_azure_container_apps_environment_id string
1411

1512
resource cache 'Microsoft.App/containerApps@2024-03-01' = {
@@ -31,8 +28,6 @@ resource cache 'Microsoft.App/containerApps@2024-03-01' = {
3128
image: 'docker.io/library/redis:7.4'
3229
name: 'cache'
3330
args: [
34-
'--requirepass'
35-
cache_password_value
3631
'--save'
3732
'60'
3833
'1'

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
"resources": {
44
"redis": {
55
"type": "container.v0",
6-
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port},password={redis-password.value}",
6+
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port}",
77
"image": "docker.io/library/redis:7.4",
8-
"args": [
9-
"--requirepass",
10-
"{redis-password.value}"
11-
],
128
"bindings": {
139
"tcp": {
1410
"scheme": "tcp",
@@ -63,21 +59,6 @@
6359
"port": 13456
6460
}
6561
}
66-
},
67-
"redis-password": {
68-
"type": "parameter.v0",
69-
"value": "{redis-password.inputs.value}",
70-
"inputs": {
71-
"value": {
72-
"type": "string",
73-
"secret": true,
74-
"default": {
75-
"generate": {
76-
"minLength": 22
77-
}
78-
}
79-
}
80-
}
8162
}
8263
}
8364
}

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
"resources": {
44
"redis": {
55
"type": "container.v0",
6-
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port},password={redis-password.value}",
6+
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port}",
77
"image": "docker.io/library/redis:7.4",
88
"args": [
9-
"--requirepass",
10-
"{redis-password.value}",
119
"--save",
1210
"60",
1311
"1"
@@ -106,21 +104,6 @@
106104
"transport": "http"
107105
}
108106
}
109-
},
110-
"redis-password": {
111-
"type": "parameter.v0",
112-
"value": "{redis-password.inputs.value}",
113-
"inputs": {
114-
"value": {
115-
"type": "string",
116-
"secret": true,
117-
"default": {
118-
"generate": {
119-
"minLength": 22
120-
}
121-
}
122-
}
123-
}
124107
}
125108
}
126109
}

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@
3333
},
3434
"basketcache": {
3535
"type": "container.v0",
36-
"connectionString": "{basketcache.bindings.tcp.host}:{basketcache.bindings.tcp.port},password={basketcache-password.value}",
36+
"connectionString": "{basketcache.bindings.tcp.host}:{basketcache.bindings.tcp.port}",
3737
"image": "docker.io/library/redis:7.4",
3838
"args": [
39-
"--requirepass",
40-
"{basketcache-password.value}",
4139
"--save",
4240
"60",
4341
"1"
@@ -242,21 +240,6 @@
242240
}
243241
}
244242
},
245-
"basketcache-password": {
246-
"type": "parameter.v0",
247-
"value": "{basketcache-password.inputs.value}",
248-
"inputs": {
249-
"value": {
250-
"type": "string",
251-
"secret": true,
252-
"default": {
253-
"generate": {
254-
"minLength": 22
255-
}
256-
}
257-
}
258-
}
259-
},
260243
"messaging-password": {
261244
"type": "parameter.v0",
262245
"value": "{messaging-password.inputs.value}",

0 commit comments

Comments
 (0)