Implement GetConnectionProperties for new connection string formatting (#916)

* baseline branch for the next major release

* Initial plan

* Implement GetConnectionProperties for all IResourceWithConnectionString resources

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Updating nightly

* Remove deprecated IDistributedApplicationLifecycleHook interface (#915)

* Initial plan

* Replace IDistributedApplicationLifecycleHook with event-based patterns

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Add tests for installer resources and update Dapr tests

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Refactor Dapr to use IDistributedApplicationEventingSubscriber

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Fixing build issue

* Updating the endpoint port

* Disabling some tests so we can move forward in other parts of the Aspire 13 update

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>
Co-authored-by: Aaron Powell <me@aaron-powell.com>

* Adjusting the version of keycloak

* Updating aspire nightly

* New nightly

* Handling url encoding

* Remove npm functionality moved to Aspire 13 (#928)

* Initial plan

* Remove AddViteApp and npm-specific functionality (moved to Aspire 13)

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Update comments and tests to reflect npm removal

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Update MONOREPO.md to remove npm references

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Adding missing types

* Bad copilot code

* Fixing missing namespace

* Handling port forwarding

* removing more stuff that has been migrated to aspire core

* Reworking how package installing is handled

* daily update

* Adding back the annotation that is no longer moving to core

* Forgot to install packages

* adding a bunch more annotations to provide enough metadata

* Removing old demo apps

* Disabling python tests

* Removing a testing change

* Updating to the latest nightly and dealing with type name changes

* Removing type that was can repurpose from aspire core

* breaking the tests down so they are easier to read

* Removing legacy docs

* Fixing failing tests

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>
Co-authored-by: Aaron Powell <me@aaron-powell.com>

* Fixing failing test

* Add GetConnectionProperties implementation to MinioContainerResource

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Add GetConnectionProperties to KurrentDB and LavinMQ resources

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Handling uri encoding which requires a reference expression wrapper

* Don't need to escape in the connection string as we now encode properly

* Reverting some changes that weren't needed

* Fixing minio encoding in tests

* Removing URL encoding as the client doesn't decode it

* forgot to revert some changes in tests

---------

Co-authored-by: Aaron Powell <me@aaron-powell.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

Author: Copilot

src/CommunityToolkit.Aspire.Hosting.ActiveMQ/ActiveMQServerResourceBase.cs

@@ -22,13 +22,23 @@ public abstract class ActiveMQServerResourceBase(string name, ParameterResource?
     /// <inheritdoc />
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create(
-            $"{scheme}://{UserNameReference}:{PasswordParameter}@{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}");
+            $"{scheme}://{UserNameReference}:{PasswordParameter:uri}@{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}");
 
     /// <summary>
     /// Gets the primary endpoint for the ActiveMQ server.
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new EndpointReference(this, PrimaryEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the parameter that contains the ActiveMQ server username.
     /// </summary>
@@ -49,7 +59,24 @@ public abstract class ActiveMQServerResourceBase(string name, ParameterResource?
         UserNameParameter is not null ?
             ReferenceExpression.Create($"{UserNameParameter}") :
             ReferenceExpression.Create($"{DefaultUserName}");
-    
+
+    /// <summary>
+    /// Gets the connection URI expression for the ActiveMQ server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>{scheme}://{user}:{password}@{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ConnectionStringExpression;
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Username", UserNameReference);
+        yield return new("Password", ReferenceExpression.Create($"{PasswordParameter}"));
+        yield return new("Uri", UriExpression);
+    }
+
     private static T ThrowIfNull<T>([NotNull] T? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
         => argument ?? throw new ArgumentNullException(paramName);
 }

src/CommunityToolkit.Aspire.Hosting.Flagd/FlagdResource.cs

@@ -24,6 +24,16 @@ public class FlagdResource(string name) : ContainerResource(name), IResourceWith
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpointReference ??= new(this, HttpEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the health check HTTP endpoint for the flagd server.
     /// </summary>
@@ -41,4 +51,19 @@ public class FlagdResource(string name) : ContainerResource(name), IResourceWith
         ReferenceExpression.Create(
             $"{PrimaryEndpoint.Property(EndpointProperty.Scheme)}://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}"
         );
+
+    /// <summary>
+    /// Gets the connection URI expression for the flagd server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ConnectionStringExpression;
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.GoFeatureFlag/GoFeatureFlagResource.cs

@@ -18,9 +18,34 @@ public class GoFeatureFlagResource(string name) : ContainerResource(name), IReso
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, PrimaryEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the connection string expression for the GO Feature Flag instance.
     /// </summary>
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create($"Endpoint=http://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}");
+
+    /// <summary>
+    /// Gets the connection URI expression for the GO Feature Flag instance.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"http://{Host}:{Port}");
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.KurrentDB/KurrentDBResource.cs

@@ -19,10 +19,35 @@ public class KurrentDBResource(string name) : ContainerResource(name), IResource
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, HttpEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the connection string for the KurrentDB server.
     /// </summary>
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create(
             $"kurrentdb://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}?tls=false");
+
+    /// <summary>
+    /// Gets the connection URI expression for the KurrentDB server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>kurrentdb://{host}:{port}?tls=false</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ConnectionStringExpression;
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.LavinMQ/LavinMQContainerResource.cs

@@ -20,6 +20,16 @@ public class LavinMQContainerResource(string name)
     private EndpointReference? _primaryEndpoint;
     private EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new EndpointReference(this, PrimaryEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     private static ReferenceExpression UserNameReference => ReferenceExpression.Create($"{DefaultUserName}");
 
     private static ReferenceExpression PasswordReference => ReferenceExpression.Create($"{DefaultPassword}");
@@ -29,4 +39,21 @@ public class LavinMQContainerResource(string name)
     /// </summary>
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create($"amqp://{UserNameReference}:{PasswordReference}@{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}/");
+
+    /// <summary>
+    /// Gets the connection URI expression for the LavinMQ server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>amqp://{user}:{password}@{host}:{port}/</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ConnectionStringExpression;
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Username", UserNameReference);
+        yield return new("Password", PasswordReference);
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.MailPit/MailPitContainerResource.cs

@@ -15,9 +15,34 @@ public class MailPitContainerResource(string name) : ContainerResource(name), IR
     private EndpointReference? _smtpEndpoint;
     private EndpointReference SmtpEndpoint => _smtpEndpoint ??= new EndpointReference(this, SmtpEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for the SMTP endpoint.
+    /// </summary>
+    public EndpointReferenceExpression Host => SmtpEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for the SMTP endpoint.
+    /// </summary>
+    public EndpointReferenceExpression Port => SmtpEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// ConnectionString for MailPit smtp endpoint in the form of smtp://host:port.
     /// </summary>
     public ReferenceExpression ConnectionStringExpression => ReferenceExpression.Create(
         $"Endpoint={SmtpEndpoint.Scheme}://{SmtpEndpoint.Property(EndpointProperty.Host)}:{SmtpEndpoint.Property(EndpointProperty.Port)}");
+
+    /// <summary>
+    /// Gets the connection URI expression for the MailPit SMTP endpoint.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>smtp://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"{SmtpEndpoint.Scheme}://{Host}:{Port}");
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.Meilisearch/MeilisearchResource.cs

@@ -22,6 +22,16 @@ public MeilisearchResource(string name, ParameterResource masterKey) : base(name
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, PrimaryEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the parameter that contains the Meilisearch superuser password.
     /// </summary>
@@ -32,5 +42,21 @@ public MeilisearchResource(string name, ParameterResource masterKey) : base(name
     /// </summary>
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create($"Endpoint=http://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)};MasterKey={MasterKeyParameter}");
+
+    /// <summary>
+    /// Gets the connection URI expression for the Meilisearch server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"http://{Host}:{Port}");
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("MasterKey", ReferenceExpression.Create($"{MasterKeyParameter}"));
+        yield return new("Uri", UriExpression);
+    }
 }
 

src/CommunityToolkit.Aspire.Hosting.Minio/MinioContainerResource.cs

@@ -29,12 +29,30 @@ public sealed class MinioContainerResource(string name, ParameterResource rootUs
     /// Gets the primary endpoint for the MinIO. This endpoint is used for all API calls over HTTP.
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, PrimaryEndpointName);
-    
+
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the connection string expression for the Minio
     /// </summary>
     public ReferenceExpression ConnectionStringExpression => GetConnectionString();
-    
+
+    /// <summary>
+    /// Gets the connection URI expression for the MinIO server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"http://{Host}:{Port}");
+
     /// <summary>
     /// Gets the connection string for the MinIO server.
     /// </summary>
@@ -49,7 +67,7 @@ public sealed class MinioContainerResource(string name, ParameterResource rootUs
 
         return ConnectionStringExpression.GetValueAsync(cancellationToken);
     }
-    
+
     /// <summary>
     /// Gets the connection string for the MinIO server.
     /// </summary>
@@ -70,4 +88,13 @@ internal void SetPassword(ParameterResource password)
     {
         PasswordParameter = password;
     }
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("AccessKey", ReferenceExpression.Create($"{RootUser}"));
+        yield return new("SecretKey", ReferenceExpression.Create($"{PasswordParameter}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaModelResource.cs

@@ -26,6 +26,11 @@ public class OllamaModelResource(string name, string modelName, OllamaResource p
     /// </summary>
     public string ModelName { get; } = ThrowIfNull(modelName);
 
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
+        Parent.CombineProperties([
+            new("Model", ReferenceExpression.Create($"{ModelName}"))
+        ]);
+
     private static T ThrowIfNull<T>([NotNull] T? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
         => argument ?? throw new ArgumentNullException(paramName);
 }

src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResource.cs

@@ -25,6 +25,16 @@ public class OllamaResource(string name) : ContainerResource(name), IResourceWit
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpointReference ??= new(this, OllamaEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the connection string expression for the Ollama server.
     /// </summary>
@@ -33,6 +43,14 @@ public class OllamaResource(string name) : ContainerResource(name), IResourceWit
         $"Endpoint={PrimaryEndpoint.Property(EndpointProperty.Scheme)}://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}"
       );
 
+    /// <summary>
+    /// Gets the connection URI expression for the Ollama server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"{PrimaryEndpoint.Property(EndpointProperty.Scheme)}://{Host}:{Port}");
+
     /// <summary>
     /// Adds a model to the list of models to download on initial startup.
     /// </summary>
@@ -45,4 +63,11 @@ public void AddModel(string modelName)
             _models.Add(modelName);
         }
     }
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }