Move encoding to ReferenceExpression (#12082)

Fixes #12070

Author: sebastienros

src/Aspire.Hosting.Azure.AppContainers/Aspire.Hosting.Azure.AppContainers.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedDir)ResourceNameComparer.cs" LinkBase="Shared\ResourceNameComparer.cs" />
+    <Compile Include="$(SharedDir)BicepFormattingHelpers.cs" LinkBase="Shared\BicepFormattingHelpers.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.AppContainers/BaseContainerAppContext.cs

@@ -8,6 +8,7 @@
 using Azure.Provisioning.AppContainers;
 using Azure.Provisioning.Expressions;
 using Azure.Provisioning.Resources;
+using Aspire.Hosting.Azure.Utils;
 
 namespace Aspire.Hosting.Azure;
 
@@ -253,21 +254,6 @@ BicepValue<string> GetHostValue(string? prefix = null, string? suffix = null)
             return (AllocateParameter(output, secretType: secretType), secretType);
         }
 
-        if (value is IUrlEncoderProvider encoder && encoder.ValueProvider is { } valueProvider)
-        {
-            // Evaluate the inner value to get the bicep expression
-            var (innerValue, secret) = ProcessValue(valueProvider, secretType: secretType, parent: parent);
-
-            var innerExpression = innerValue switch
-            {
-                ProvisioningParameter p => p.Value.Compile(),
-                IBicepValue b => b.Compile(),
-                _ => throw new ArgumentException($"Invalid expression type for url-encoding: {innerValue.GetType()}")
-            };
-
-            return (new FunctionCallExpression(new IdentifierExpression("uriComponent"), innerExpression), secret);
-        }
-
 #pragma warning disable CS0618 // Type or member is obsolete
         if (value is BicepSecretOutputReference)
         {
@@ -303,7 +289,14 @@ BicepValue<string> GetHostValue(string? prefix = null, string? suffix = null)
             // Special case simple expressions
             if (expr.Format == "{0}" && expr.ValueProviders.Count == 1)
             {
-                return ProcessValue(expr.ValueProviders[0], secretType, parent: parent);
+                var val = ProcessValue(expr.ValueProviders[0], secretType, parent: parent);
+
+                if (expr.StringFormats[0] is string format)
+                {
+                    val = (BicepFormattingHelpers.FormatBicepExpression(val, format), secretType);
+                }
+
+                return val;
             }
 
             var args = new object[expr.ValueProviders.Count];
@@ -319,11 +312,15 @@ BicepValue<string> GetHostValue(string? prefix = null, string? suffix = null)
                     finalSecretType = SecretType.Normal;
                 }
 
+                if (expr.StringFormats[index] is string format)
+                {
+                    val = BicepFormattingHelpers.FormatBicepExpression(val, format);
+                }
+
                 args[index++] = val;
             }
 
             return (FormattableStringFactory.Create(expr.Format, args), finalSecretType);
-
         }
 
         if (value is IManifestExpressionProvider manifestExpressionProvider)

src/Aspire.Hosting.Azure.AppService/Aspire.Hosting.Azure.AppService.csproj

@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedDir)ResourceNameComparer.cs" LinkBase="Shared\ResourceNameComparer.cs" />
+    <Compile Include="$(SharedDir)BicepFormattingHelpers.cs" LinkBase="Shared\BicepFormattingHelpers.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.AppService/AzureAppServiceWebsiteContext.cs

@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using Aspire.Hosting.ApplicationModel;
+using Aspire.Hosting.Azure.Utils;
 using Azure.Provisioning;
 using Azure.Provisioning.AppService;
 using Azure.Provisioning.Authorization;
@@ -141,21 +142,6 @@ private void ProcessEndpoints()
             return (AllocateParameter(output, secretType: secretType), secretType);
         }
 
-        if (value is IUrlEncoderProvider encoder && encoder.ValueProvider is { } valueProvider)
-        {
-            // Evaluate the inner value to get the bicep expression
-            var (innerValue, secret) = ProcessValue(valueProvider, secretType: secretType, parent: parent);
-
-            var innerExpression = innerValue switch
-            {
-                ProvisioningParameter p => p.Value.Compile(),
-                IBicepValue b => b.Compile(),
-                _ => throw new ArgumentException($"Invalid expression type for url-encoding: {innerValue.GetType()}")
-            };
-
-            return (new FunctionCallExpression(new IdentifierExpression("uriComponent"), innerExpression), secret);
-        }
-
         if (value is IAzureKeyVaultSecretReference vaultSecretReference)
         {
             if (parent is null)
@@ -178,7 +164,14 @@ private void ProcessEndpoints()
         {
             if (expr.Format == "{0}" && expr.ValueProviders.Count == 1)
             {
-                return ProcessValue(expr.ValueProviders[0], secretType, parent);
+                var val = ProcessValue(expr.ValueProviders[0], secretType, parent: parent);
+
+                if (expr.StringFormats[0] is string format)
+                {
+                    val = (BicepFormattingHelpers.FormatBicepExpression(val, format), secretType);
+                }
+
+                return val;
             }
 
             var args = new object[expr.ValueProviders.Count];
@@ -192,6 +185,12 @@ private void ProcessEndpoints()
                 {
                     finalSecretType = SecretType.Normal;
                 }
+
+                if (expr.StringFormats[index] is string format)
+                {
+                    val = BicepFormattingHelpers.FormatBicepExpression(val, format);
+                }
+
                 args[index++] = val;
             }
 

src/Aspire.Hosting/ApplicationModel/ExpressionResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
+using Aspire.Hosting.Utils;
 
 namespace Aspire.Hosting.ApplicationModel;
 
@@ -43,6 +44,13 @@ async Task<ResolvedValue> EvalExpressionAsync(ReferenceExpression expr)
         {
             var result = await ResolveInternalAsync(expr.ValueProviders[i]).ConfigureAwait(false);
             args[i] = result?.Value;
+
+            // Apply string format if needed
+            if (expr.StringFormats[i] is { } stringFormat && args[i] is string s)
+            {
+                args[i] = FormattingHelpers.FormatValue(s, stringFormat);
+            }
+
             if (result?.IsSensitive is true)
             {
                 isSensitive = true;