Skip to content

Reapply Redis password #7599

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 15 commits into from
Feb 26, 2025
Merged

Reapply Redis password #7599

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7c4194d
Revert "Revert redis password change (#7518)"
Alirexaa Feb 13, 2025
a106805
checkout eventhubns.module.bicep and eventhubs aspire-manifest.json
Alirexaa Feb 13, 2025
ae11271
Set password from envs
Alirexaa Feb 13, 2025
60fab89
Add redis-command in single arg instead of multiple args
Alirexaa Feb 13, 2025
f241db1
Update playground manifest
Alirexaa Feb 13, 2025
7fff67d
Update playground manifests
Alirexaa Feb 13, 2025
81b1545
fix test
Alirexaa Feb 13, 2025
db27002
Address PR feedback
Alirexaa Feb 14, 2025
c25ec21
Merge branch 'dotnet:main' into revert-7518-RevertRedisPassword
Alirexaa Feb 14, 2025
edfb4e7
Merge remote-tracking branch 'upstream/main' into revert-7518-RevertR…
eerhardt Feb 25, 2025
378514d
Respond to PR feedback
eerhardt Feb 25, 2025
6dd7249
Change Redis password generation to exclude special characters.
eerhardt Feb 26, 2025
558a037
Fix ACA bug with HostAndPort
eerhardt Feb 26, 2025
da1f4b7
Always display the port for HostAndPort
eerhardt Feb 26, 2025
a3c4cfe
Update src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppsInfra…
eerhardt Feb 26, 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
9 changes: 8 additions & 1 deletion 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,6 +5,9 @@ param api_containerport string

param storage_outputs_blobendpoint string

@secure()
param cache_password_value string

param account_outputs_connectionstring string

@secure()
Expand All @@ -30,6 +33,10 @@ 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 @@ -88,7 +95,7 @@ resource api 'Microsoft.App/containerApps@2024-03-01' = {
}
{
name: 'ConnectionStrings__cache'
value: 'cache:6379'
secretRef: 'connectionstrings--cache'
}
{
name: 'ConnectionStrings__account'
Expand Down
29 changes: 25 additions & 4 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,22 +31,23 @@
},
"cache": {
"type": "container.v1",
"connectionString": "{cache.bindings.tcp.host}:{cache.bindings.tcp.port}",
"connectionString": "{cache.bindings.tcp.host}:{cache.bindings.tcp.port},password={cache-password.value}",
"image": "docker.io/library/redis:7.4",
"deployment": {
"type": "azure.bicep.v0",
"path": "cache.module.bicep",
"params": {
"cache_volumes_0_storage": "{cache.volumes.0.storage}",
"cache_password_value": "{cache-password.value}",
"outputs_azure_container_registry_managed_identity_id": "{.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
"outputs_managed_identity_client_id": "{.outputs.MANAGED_IDENTITY_CLIENT_ID}",
"outputs_azure_container_apps_environment_id": "{.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}"
}
},
"entrypoint": "/bin/sh",
"args": [
"--save",
"60",
"1"
"-c",
"redis-server --requirepass $REDIS_PASSWORD --save 60 1"
],
"volumes": [
{
Expand All @@ -55,6 +56,9 @@
"readOnly": false
}
],
"env": {
"REDIS_PASSWORD": "{cache-password.value}"
},
"bindings": {
"tcp": {
"scheme": "tcp",
Expand Down Expand Up @@ -116,6 +120,7 @@
"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 @@ -152,6 +157,22 @@
"external": true
}
}
},
"cache-password": {
"type": "parameter.v0",
"value": "{cache-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22,
"special": false
}
}
}
}
}
}
}
21 changes: 18 additions & 3 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 @@ -3,6 +3,9 @@ param location string = resourceGroup().location

param cache_volumes_0_storage string

@secure()
param cache_password_value string

param outputs_azure_container_registry_managed_identity_id string

param outputs_managed_identity_client_id string
Expand All @@ -14,6 +17,12 @@ resource cache 'Microsoft.App/containerApps@2024-03-01' = {
location: location
properties: {
configuration: {
secrets: [
{
name: 'redis-password'
value: cache_password_value
}
]
activeRevisionsMode: 'Single'
ingress: {
external: false
Expand All @@ -27,12 +36,18 @@ resource cache 'Microsoft.App/containerApps@2024-03-01' = {
{
image: 'docker.io/library/redis:7.4'
name: 'cache'
command: [
'/bin/sh'
]
args: [
'--save'
'60'
'1'
'-c'
'redis-server --requirepass \$REDIS_PASSWORD --save 60 1'
]
env: [
{
name: 'REDIS_PASSWORD'
secretRef: 'redis-password'
}
{
name: 'AZURE_CLIENT_ID'
value: outputs_managed_identity_client_id
Expand Down
26 changes: 25 additions & 1 deletion 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,8 +3,16 @@
"resources": {
"redis": {
"type": "container.v0",
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port}",
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port},password={redis-password.value}",
"image": "docker.io/library/redis:7.4",
"entrypoint": "/bin/sh",
"args": [
"-c",
"redis-server --requirepass $REDIS_PASSWORD"
],
"env": {
"REDIS_PASSWORD": "{redis-password.value}"
},
"bindings": {
"tcp": {
"scheme": "tcp",
Expand Down Expand Up @@ -59,6 +67,22 @@
"port": 13456
}
}
},
"redis-password": {
"type": "parameter.v0",
"value": "{redis-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22,
"special": false
}
}
}
}
}
}
}
1 change: 1 addition & 0 deletions playground/Redis/Redis.AppHost/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
.WithDataVolume("valkey-data");

builder.AddProject<Projects.Redis_ApiService>("apiservice")
.WithExternalHttpEndpoints()
.WithReference(redis).WaitFor(redis)
.WithReference(garnet).WaitFor(garnet)
.WithReference(valkey).WaitFor(valkey);
Expand Down
33 changes: 27 additions & 6 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,12 +3,12 @@
"resources": {
"redis": {
"type": "container.v0",
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port}",
"connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port},password={redis-password.value}",
"image": "docker.io/library/redis:7.4",
"entrypoint": "/bin/sh",
"args": [
"--save",
"60",
"1"
"-c",
"redis-server --requirepass $REDIS_PASSWORD --save 60 1"
],
"volumes": [
{
Expand All @@ -17,6 +17,9 @@
"readOnly": false
}
],
"env": {
"REDIS_PASSWORD": "{redis-password.value}"
},
"bindings": {
"tcp": {
"scheme": "tcp",
Expand Down Expand Up @@ -96,12 +99,30 @@
"http": {
"scheme": "http",
"protocol": "tcp",
"transport": "http"
"transport": "http",
"external": true
},
"https": {
"scheme": "https",
"protocol": "tcp",
"transport": "http"
"transport": "http",
"external": true
}
}
},
"redis-password": {
"type": "parameter.v0",
"value": "{redis-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22,
"special": false
}
}
}
}
}
Expand Down
27 changes: 23 additions & 4 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,12 +33,12 @@
},
"basketcache": {
"type": "container.v0",
"connectionString": "{basketcache.bindings.tcp.host}:{basketcache.bindings.tcp.port}",
"connectionString": "{basketcache.bindings.tcp.host}:{basketcache.bindings.tcp.port},password={basketcache-password.value}",
"image": "docker.io/library/redis:7.4",
"entrypoint": "/bin/sh",
"args": [
"--save",
"60",
"1"
"-c",
"redis-server --requirepass $REDIS_PASSWORD --save 60 1"
],
"volumes": [
{
Expand All @@ -47,6 +47,9 @@
"readOnly": false
}
],
"env": {
"REDIS_PASSWORD": "{basketcache-password.value}"
},
"bindings": {
"tcp": {
"scheme": "tcp",
Expand Down Expand Up @@ -240,6 +243,22 @@
}
}
},
"basketcache-password": {
"type": "parameter.v0",
"value": "{basketcache-password.inputs.value}",
"inputs": {
"value": {
"type": "string",
"secret": true,
"default": {
"generate": {
"minLength": 22,
"special": false
}
}
}
}
},
"messaging-password": {
"type": "parameter.v0",
"value": "{messaging-password.inputs.value}",
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppsInfrastructure.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ BicepValue<string> GetHostValue(string? prefix = null, string? suffix = null)
EndpointProperty.Url => GetHostValue($"{scheme}://", suffix: isHttpIngress ? null : $":{port}"),
EndpointProperty.Host or EndpointProperty.IPV4Host => GetHostValue(),
EndpointProperty.Port => port.ToString(CultureInfo.InvariantCulture),
EndpointProperty.HostAndPort=> GetHostValue(suffix: isHttpIngress ? null : $":{port}"),
Copy link
Member

@eerhardt eerhardt Feb 26, 2025

Choose a reason for hiding this comment

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

FYI - @davidfowl - I found a bug that we missed here and fixed it so all the generate-manifests work again.

Copy link
Member

@eerhardt eerhardt Feb 26, 2025

Choose a reason for hiding this comment

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

I didn't know if I should switch off isHttpIngress or not. If you explicitly ask for HostAndPort and this is the httpIngress, should we still tack on :80?

Copy link
Member

@eerhardt eerhardt Feb 26, 2025

Choose a reason for hiding this comment

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

Rethinking this, I think it should always put the port. The reasoning the URL can drop the port is because it contains the scheme at the begining. http:// indicates what the port is. If you say HostAndPort we should always give you the host and the port.

Copy link
Member

@davidfowl davidfowl Feb 26, 2025

Choose a reason for hiding this comment

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

I agree, it should include host an port

EndpointProperty.TargetPort => targetPort is null ? AllocateContainerPortParameter() : targetPort,
EndpointProperty.Scheme => scheme,
_ => throw new NotSupportedException(),
Expand Down
Loading
Loading