优化结构

internal/data/repository/integration_config.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"kra/internal/biz"
-	"kra/internal/integrationruntime"
+	"kra/internal/integration/runtimeconfig"
 
 	"gorm.io/gorm"
 )
@@ -27,6 +27,10 @@ func (integrationConfigPO) TableName() string { return "sys_integration_configs"
 
 type integrationConfigRepo struct{ data Provider }
 
+type integrationRuntimeProvider interface {
+	IntegrationRuntime() *runtimeconfig.Store
+}
+
 func NewIntegrationConfigRepo(data Provider) biz.IntegrationConfigRepo {
 	return &integrationConfigRepo{data: data}
 }
@@ -93,18 +97,25 @@ func (r *integrationConfigRepo) DeleteIntegrationConfig(ctx context.Context, kin
 	if err := r.data.DB().WithContext(ctx).Where("kind = ? AND provider = ?", kind, provider).Delete(&integrationConfigPO{}).Error; err != nil {
 		return err
 	}
-	if runtime := r.data.IntegrationRuntime(); runtime != nil {
+	if runtime := integrationRuntime(r.data); runtime != nil {
 		runtime.Delete(kind, provider)
 	}
 	return nil
 }
 
 func (r *integrationConfigRepo) publish(kind, provider string, enabled bool, values []byte) {
-	if runtime := r.data.IntegrationRuntime(); runtime != nil {
-		runtime.Set(integrationruntime.Config{Kind: kind, Provider: provider, Enabled: enabled, Values: values})
+	if runtime := integrationRuntime(r.data); runtime != nil {
+		runtime.Set(runtimeconfig.Config{Kind: kind, Provider: provider, Enabled: enabled, Values: values})
 	}
 }
 
+func integrationRuntime(provider Provider) *runtimeconfig.Store {
+	if value, ok := provider.(integrationRuntimeProvider); ok {
+		return value.IntegrationRuntime()
+	}
+	return nil
+}
+
 func integrationConfigFromPO(row integrationConfigPO) *biz.IntegrationConfig {
 	values := integrationObject(json.RawMessage(row.Config))
 	maskIntegrationSecrets(row.Kind, row.Provider, values)

internal/data/repository/integration_config_runtime_test.go

@@ -0,0 +1,53 @@
+package system
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"kra/internal/biz"
+	"kra/internal/integration/runtimeconfig"
+)
+
+type integrationRuntimeTestProvider struct {
+	*Data
+	store *runtimeconfig.Store
+}
+
+func (p *integrationRuntimeTestProvider) IntegrationRuntime() *runtimeconfig.Store { return p.store }
+
+func TestIntegrationConfigSavePublishesUnmaskedRuntimeValues(t *testing.T) {
+	db, err := openWithDriver("sqlite", "file:"+t.Name()+"?mode=memory&cache=shared")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = db.AutoMigrate(&integrationConfigPO{}); err != nil {
+		t.Fatal(err)
+	}
+	provider := &integrationRuntimeTestProvider{Data: &Data{gormDB: newReloadableDB(db, nil)}, store: runtimeconfig.NewStore()}
+	repo := &integrationConfigRepo{data: provider}
+
+	values := biz.DefaultIntegrationConfig(biz.IntegrationKindMQ, "rabbitmq")
+	values["password"] = "runtime-secret"
+	raw, _ := json.Marshal(values)
+	if err = repo.SaveIntegrationConfig(context.Background(), &biz.IntegrationConfig{Kind: biz.IntegrationKindMQ, Provider: "rabbitmq", Enabled: true, Values: raw}); err != nil {
+		t.Fatal(err)
+	}
+
+	values["password"] = "******"
+	raw, _ = json.Marshal(values)
+	if err = repo.SaveIntegrationConfig(context.Background(), &biz.IntegrationConfig{Kind: biz.IntegrationKindMQ, Provider: "rabbitmq", Enabled: true, Values: raw}); err != nil {
+		t.Fatal(err)
+	}
+	active, ok := provider.store.Get(biz.IntegrationKindMQ, "rabbitmq")
+	if !ok || !active.Enabled {
+		t.Fatalf("runtime config = %#v, ok=%v", active, ok)
+	}
+	stored := map[string]any{}
+	if err = json.Unmarshal(active.Values, &stored); err != nil {
+		t.Fatal(err)
+	}
+	if stored["password"] != "runtime-secret" {
+		t.Fatalf("runtime password = %#v", stored["password"])
+	}
+}

internal/data/repository/provider.go

@@ -2,7 +2,6 @@ package system
 
 import (
 	"kra/internal/conf"
-	"kra/internal/integrationruntime"
 
 	"gorm.io/gorm"
 )
@@ -14,5 +13,4 @@ type Provider interface {
 	Database(name string) (*gorm.DB, error)
 	DatabaseReady() bool
 	Runtime() *conf.Runtime
-	IntegrationRuntime() *integrationruntime.Store
 }