Skip to content

Revert redis password change #7518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 11, 2025
Merged

Revert redis password change #7518

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7f0f39
Revert "Follow up from Redis Password change (#7356)"
eerhardt Feb 10, 2025
2d2d13e
Revert "Add Password To Redis (#4642)"
eerhardt Feb 10, 2025
fa3b9cc
Remove unnecessary using
eerhardt Feb 10, 2025
25d1417
Revert unnecessary changes
eerhardt Feb 10, 2025
909f3de
Merge remote-tracking branch 'upstream/main' into RevertRedisPassword
eerhardt Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions playground/AspireEventHub/EventHubs.AppHost/aspire-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@
"principalId": ""
}
},
"eventhub": {
Copy link
Member Author

@eerhardt eerhardt Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI - These are caused by other changes that didn't update the playground manifests.

"type": "value.v0",
"connectionString": "Endpoint={eventhubns.outputs.eventHubsEndpoint};EntityPath=eventhub"
},
"consumer": {
"type": "project.v0",
"path": "../EventHubsConsumer/EventHubsConsumer.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__eventhubns": "{eventhubns.connectionString}",
"ConnectionStrings__eventhub": "{eventhub.connectionString}",
"ConnectionStrings__checkpoints": "{checkpoints.connectionString}"
}
},
Expand All @@ -42,7 +46,7 @@
"OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY": "in_memory",
"ASPNETCORE_FORWARDEDHEADERS_ENABLED": "true",
"HTTP_PORTS": "{api.bindings.http.targetPort}",
"ConnectionStrings__eventhubns": "{eventhubns.connectionString}"
"ConnectionStrings__eventhub": "{eventhub.connectionString}"
},
"bindings": {
"http": {
Expand Down
4 changes: 2 additions & 2 deletions playground/AspireEventHub/EventHubs.AppHost/eventhubns.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ resource eventhubns_AzureEventHubsDataOwner 'Microsoft.Authorization/roleAssignm
scope: eventhubns
}

resource hub 'Microsoft.EventHub/namespaces/eventhubs@2024-01-01' = {
name: 'hub'
resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2024-01-01' = {
name: 'eventhub'
parent: eventhubns
}

Expand Down
9 changes: 1 addition & 8 deletions playground/AzureContainerApps/AzureContainerApps.AppHost/api.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ param api_containerport string

param storage_outputs_blobendpoint string

@secure()
param cache_password_value string

param account_outputs_connectionstring string

@secure()
Expand All @@ -33,10 +30,6 @@ resource api 'Microsoft.App/containerApps@2024-03-01' = {
properties: {
configuration: {
secrets: [
{
name: 'connectionstrings--cache'
value: 'cache:6379,password=${cache_password_value}'
}
{
name: 'value'
value: secretparam_value
Expand Down Expand Up @@ -95,7 +88,7 @@ resource api 'Microsoft.App/containerApps@2024-03-01' = {
}
{
name: 'ConnectionStrings__cache'
secretRef: 'connectionstrings--cache'
value: 'cache:6379'
}
{
name: 'ConnectionStrings__account'
Expand Down
21 changes: 1 addition & 20 deletions playground/AzureContainerApps/AzureContainerApps.AppHost/aspire-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"cache": {
"type": "container.v1",
"connectionString": "{cache.bindings.tcp.host}:{cache.bindings.tcp.port},password={cache-password.value}",
"connectionString": "{cache.bindings.tcp.host}:{cache.bindings.tcp.port}",
"image": "docker.io/library/redis:7.4",
"deployment": {
"type": "azure.bicep.v0",
Expand All @@ -40,13 +40,10 @@
"cache_volumes_0_storage": "{cache.volumes.0.storage}",
"outputs_azure_container_registry_managed_identity_id": "{.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
"outputs_managed_identity_client_id": "{.outputs.MANAGED_IDENTITY_CLIENT_ID}",
"cache_password_value": "{cache-password.value}",
"outputs_azure_container_apps_environment_id": "{.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}"
}
},
"args": [
"--requirepass",
"{cache-password.value}",
"--save",
"60",
"1"
Expand Down Expand Up @@ -119,7 +116,6 @@
"params": {
"api_containerport": "{api.containerPort}",
"storage_outputs_blobendpoint": "{storage.outputs.blobEndpoint}",
"cache_password_value": "{cache-password.value}",
"account_outputs_connectionstring": "{account.outputs.connectionString}",
"secretparam_value": "{secretparam.value}",
"outputs_azure_container_registry_managed_identity_id": "{.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
Expand Down Expand Up @@ -156,21 +152,6 @@
"external": true
}
}
},
"cache-password": {
"type": "parameter.v0",
"value": "{cache-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22
}
}
}
}
}
}
}
5 changes: 0 additions & 5 deletions playground/AzureContainerApps/AzureContainerApps.AppHost/cache.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ param outputs_azure_container_registry_managed_identity_id string

param outputs_managed_identity_client_id string

@secure()
param cache_password_value string

param outputs_azure_container_apps_environment_id string

resource cache 'Microsoft.App/containerApps@2024-03-01' = {
Expand All @@ -31,8 +28,6 @@ resource cache 'Microsoft.App/containerApps@2024-03-01' = {
image: 'docker.io/library/redis:7.4'
name: 'cache'
args: [
'--requirepass'
cache_password_value
'--save'
'60'
'1'
Expand Down
21 changes: 1 addition & 20 deletions playground/ProxylessEndToEnd/ProxylessEndToEnd.AppHost/aspire-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@
"resources": {
"redis": {
"type": "container.v0",
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port},password={redis-password.value}",
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port}",
"image": "docker.io/library/redis:7.4",
"args": [
"--requirepass",
"{redis-password.value}"
],
"bindings": {
"tcp": {
"scheme": "tcp",
Expand Down Expand Up @@ -63,21 +59,6 @@
"port": 13456
}
}
},
"redis-password": {
"type": "parameter.v0",
"value": "{redis-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22
}
}
}
}
}
}
}
19 changes: 1 addition & 18 deletions playground/Redis/Redis.AppHost/aspire-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
"resources": {
"redis": {
"type": "container.v0",
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port},password={redis-password.value}",
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port}",
"image": "docker.io/library/redis:7.4",
"args": [
"--requirepass",
"{redis-password.value}",
"--save",
"60",
"1"
Expand Down Expand Up @@ -106,21 +104,6 @@
"transport": "http"
}
}
},
"redis-password": {
"type": "parameter.v0",
"value": "{redis-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22
}
}
}
}
}
}
}
19 changes: 1 addition & 18 deletions playground/TestShop/TestShop.AppHost/aspire-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@
},
"basketcache": {
"type": "container.v0",
"connectionString": "{basketcache.bindings.tcp.host}:{basketcache.bindings.tcp.port},password={basketcache-password.value}",
"connectionString": "{basketcache.bindings.tcp.host}:{basketcache.bindings.tcp.port}",
"image": "docker.io/library/redis:7.4",
"args": [
"--requirepass",
"{basketcache-password.value}",
"--save",
"60",
"1"
Expand Down Expand Up @@ -242,21 +240,6 @@
}
}
},
"basketcache-password": {
"type": "parameter.v0",
"value": "{basketcache-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22
}
}
}
}
},
"messaging-password": {
"type": "parameter.v0",
"value": "{messaging-password.inputs.value}",
Expand Down
Loading