Allow services specified at cluster level to be server group defaults

Author: brantburnett

src/Couchbase.Aspire.Hosting/CouchbaseClusterBuilderExtensions.cs

@@ -258,7 +258,8 @@ await rns.PublishUpdateAsync(resource, s =>
     }
 
     /// <summary>
-    /// Specify the Couchbase services to be enabled on this cluster. Only applies if no server groups are added.
+    /// Specify the Couchbase services to be enabled on this cluster. This is the default for any
+    /// server groups added which do not explicitly specify services.
     /// </summary>
     /// <param name="builder">Builder for the Couchbase cluster.</param>
     /// <param name="services">The services to be enabled.</param>
@@ -268,15 +269,7 @@ public static IResourceBuilder<CouchbaseClusterResource> WithServices(this IReso
     {
         ArgumentNullException.ThrowIfNull(builder);
 
-        var serverGroup = builder.Resource.ServerGroups.Values.FirstOrDefault(p => p.IsDefaultServerGroup);
-        if (serverGroup is null)
-        {
-            throw new InvalidOperationException("Services may only be set on the Couchbase cluster when no service groups are added. Use WithServices on the server group instead.");
-        }
-
-        builder.ApplicationBuilder.CreateResourceBuilder(serverGroup).WithServices(services);
-
-        return builder;
+        return builder.WithAnnotation(new CouchbaseServicesAnnotation(services), ResourceAnnotationMutationBehavior.Replace);
     }
 
     public static IResourceBuilder<CouchbaseClusterResource> WithSettings(this IResourceBuilder<CouchbaseClusterResource> builder, Action<CouchbaseClusterSettingsCallbackContext> configureSettings)

src/Couchbase.Aspire.Hosting/CouchbaseResourceExtensions.cs

@@ -48,19 +48,37 @@ public static CouchbaseIndexStorageMode GetIndexStorageMode(this CouchbaseCluste
             : CouchbaseIndexStorageMode.ForestDB);
     }
 
-    public static CouchbaseServices GetCouchbaseServices(this ICouchbaseCustomResource resource)
+    private static CouchbaseServices ApplyDefaults(this CouchbaseServices services) =>
+        services == CouchbaseServices.Default
+            ? CouchbaseServicesAnnotation.DefaultServices
+            : services;
+
+    private static CouchbaseServicesAnnotation? GetCouchbaseServicesAnnotation(this ICouchbaseCustomResource resource)
     {
         ArgumentNullException.ThrowIfNull(resource);
 
-        CouchbaseServices services = CouchbaseServices.Default;
         if (resource.TryGetLastAnnotation<CouchbaseServicesAnnotation>(out var annotation))
         {
-            services = annotation.Services;
+            return annotation;
         }
 
-        return services == CouchbaseServices.Default
-            ? CouchbaseServicesAnnotation.DefaultServices
-            : services;
+        return null;
+    }
+
+    public static CouchbaseServices GetCouchbaseServices(this CouchbaseClusterResource cluster)
+    {
+        ArgumentNullException.ThrowIfNull(cluster);
+
+        return (cluster.GetCouchbaseServicesAnnotation()?.Services ?? CouchbaseServices.Default).ApplyDefaults();
+    }
+
+    public static CouchbaseServices GetCouchbaseServices(this CouchbaseServerGroupResource serverGroup)
+    {
+        ArgumentNullException.ThrowIfNull(serverGroup);
+
+        var annotation = serverGroup.GetCouchbaseServicesAnnotation() ?? serverGroup.Parent.GetCouchbaseServicesAnnotation();
+
+        return (annotation?.Services ?? CouchbaseServices.Default).ApplyDefaults();
     }
 
     public static CouchbaseServices GetCouchbaseServices(this CouchbaseServerResource server)