fix: dynamically detect value (#42)

Author: aaronschweig

pkg/config/config.go

@@ -13,11 +13,10 @@ import (
 )
 
 type ServiceConfig struct {
-	ProviderWorkspaceID string `mapstructure:"provider-workspace-id" default:"2pkfvpweuy7symvj"`
-	Kubeconfig          string `mapstructure:"kubeconfig"`
-	ServerURL           string `mapstructure:"server-url"`
-	EntityLabel         string `mapstructure:"entity-label" default:"ui.platform-mesh.ui/entity"`
-	ContentForLabel     string `mapstructure:"content-for-label" default:"ui.platform-mesh.io/content-for"`
+	Kubeconfig      string `mapstructure:"kubeconfig"`
+	ServerURL       string `mapstructure:"server-url"`
+	EntityLabel     string `mapstructure:"entity-label" default:"ui.platform-mesh.ui/entity"`
+	ContentForLabel string `mapstructure:"content-for-label" default:"ui.platform-mesh.io/content-for"`
 
 	ResourceSchemaName      string `mapstructure:"resource-schema-name" default:"v250704-6d57f16.contentconfigurations.ui.platform-mesh.io"`
 	ResourceSchemaWorkspace string `mapstructure:"resource-schema-workspace" default:"root:openmfp-system"`

pkg/contentconfiguration/server.go

@@ -75,9 +75,14 @@ func BuildVirtualWorkspace(
 					return nil, err
 				}
 
+				providerWSCluster, err := clusterResolver(ctx, logicalcluster.NewPath(cfg.ResourceSchemaWorkspace))
+				if err != nil {
+					return nil, err
+				}
+
 				storeageProvider := storage.CreateStorageProviderFunc(
 					dynamicClient,
-					storage.ContentConfigurationLookup(dynamicClient, cfg),
+					storage.ContentConfigurationLookup(dynamicClient, cfg, providerWSCluster.Name.String()),
 				)
 
 				gvr := schema.GroupVersionResource{

pkg/storage/filter.go

@@ -42,7 +42,8 @@ func ClusterPathFrom(ctx context.Context) (logicalcluster.Path, bool) {
 	return path, true
 }
 
-func ContentConfigurationLookup(client dynamic.ClusterInterface, cfg config.ServiceConfig) forwardingregistry.StorageWrapper {
+func ContentConfigurationLookup(client dynamic.ClusterInterface, cfg config.ServiceConfig, providerWorkspaceID string) forwardingregistry.StorageWrapper {
+
 	return forwardingregistry.StorageWrapperFunc(func(resource schema.GroupResource, storage *forwardingregistry.StoreFuncs) {
 		delegateLister := storage.ListerFunc
 		storage.ListerFunc = func(ctx context.Context, options *internalversion.ListOptions) (runtime.Object, error) {
@@ -117,7 +118,7 @@ func ContentConfigurationLookup(client dynamic.ClusterInterface, cfg config.Serv
 			}
 
 			providerCtx := genericapirequest.WithCluster(ctx, genericapirequest.Cluster{
-				Name: logicalcluster.Name(cfg.ProviderWorkspaceID),
+				Name: logicalcluster.Name(providerWorkspaceID),
 			})
 
 			providerOpts := options.DeepCopy()