Enhance Dapr sidecar configuration with default AppId and options handling

Author: FullStackChef

examples/dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost/Program.cs

@@ -17,6 +17,7 @@
 
 
 builder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_Dapr_ServiceA>("servicea")
+       .PublishAsAzureContainerApp((i,c)=> { })
        .WithDaprSidecar(sidecar => sidecar.WithReference(stateStore).WithReference(pubSub))
        .WaitFor(redis);
 

src/CommunityToolkit.Aspire.Hosting.Azure.Dapr/AzureDaprHostingExtensions.cs

@@ -50,7 +50,7 @@ public static void AddScopes(this IResourceBuilder<IDaprComponentResource> build
         foreach (var resource in builder.ApplicationBuilder.Resources)
         {
             if (!resource.TryGetLastAnnotation<DaprSidecarAnnotation>(out var daprAnnotation) ||
-            !resource.TryGetAnnotationsOfType<DaprComponentReferenceAnnotation>(out var daprComponentReferenceAnnotations))
+               !daprAnnotation.Sidecar.TryGetAnnotationsOfType<DaprComponentReferenceAnnotation>(out var daprComponentReferenceAnnotations))
             {
                 continue;
             }

src/CommunityToolkit.Aspire.Hosting.Dapr/IDistributedApplicationComponentBuilderExtensions.cs

@@ -62,8 +62,40 @@ public static IResourceBuilder<T> WithDaprSidecar<T>(this IResourceBuilder<T> bu
                                                            IsHidden = true,
                                                        });
 
+
+        var serviceId = builder.Resource.Name;
+
         configureSidecar(sidecarBuilder);
 
+        if(sidecarBuilder.Resource.TryGetAnnotationsOfType<DaprSidecarOptionsAnnotation>(out var optionsAnnotations) &&
+           optionsAnnotations.LastOrDefault() is { } optionsAnnotation)
+        {
+            // If no AppId was specified, use the resource name.
+            if (string.IsNullOrEmpty(optionsAnnotation.Options.AppId))
+            {
+                sidecarBuilder.WithOptions(new DaprSidecarOptions
+                {
+                    AppId = serviceId,
+                    Config = optionsAnnotation.Options.Config,
+                    EnableApiLogging = optionsAnnotation.Options.EnableApiLogging,
+                    LogLevel = optionsAnnotation.Options.LogLevel,
+                    EnableProfiling = optionsAnnotation.Options.EnableProfiling,
+                    MetricsPort = optionsAnnotation.Options.MetricsPort,
+                    DaprHttpPort = optionsAnnotation.Options.DaprHttpPort,
+                    DaprGrpcPort = optionsAnnotation.Options.DaprGrpcPort,
+                });
+            }
+        }
+        else
+        {
+            // No options were specified, so set a default AppId.
+            sidecarBuilder.WithOptions(new DaprSidecarOptions
+            {
+                AppId = serviceId,
+            });
+        }
+
+
         return builder.WithAnnotation(new DaprSidecarAnnotation(sidecarBuilder.Resource));
     }