feat: no default injection during syncs

Author: Prashansa-K

cmd/common.go

@@ -17,6 +17,7 @@ import (
 	"github.com/kong/go-database-reconciler/pkg/diff"
 	"github.com/kong/go-database-reconciler/pkg/dump"
 	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/schema"
 	"github.com/kong/go-database-reconciler/pkg/state"
 	reconcilerUtils "github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/kong/go-kong/kong"
@@ -29,6 +30,8 @@ var (
 	assumeYes        bool
 	noMaskValues     bool
 	syncCmdAssumeYes bool
+
+	schemaRegistry *schema.Registry
 )
 
 type mode int
@@ -191,6 +194,10 @@ func syncMain(ctx context.Context, filenames []string, dry bool, parallelism,
 	var kongClient *kong.Client
 	mode := getMode(targetContent)
 	if mode == modeKonnect {
+		if skipDefaultsFill {
+			dumpConfig.SkipDefaults = true
+		}
+
 		// Konnect ConsumerGroup APIs don't support the query-parameter list_consumers yet
 		if dumpConfig.SkipConsumersWithConsumerGroups {
 			return errors.New("the flag --skip-consumers-with-consumer-groups can not be used with Konnect")
@@ -279,6 +286,9 @@ func syncMain(ctx context.Context, filenames []string, dry bool, parallelism,
 		}
 	}
 
+	schemaRegistry = schema.NewRegistry(ctx, kongClient, mode == modeKonnect)
+	dumpConfig.SchemaRegistry = schemaRegistry
+
 	dumpConfig.IsConsumerGroupPolicyOverrideSet = determinePolicyOverride(*targetContent, dumpConfig)
 
 	dumpConfig.SelectorTags, err = determineSelectorTag(*targetContent, dumpConfig)
@@ -696,13 +706,15 @@ func performDiff(ctx context.Context, currentState, targetState *state.KongState
 	shouldSkipDeletes := applyType == ApplyTypePartial
 
 	s, err := diff.NewSyncer(diff.SyncerOpts{
-		CurrentState:  currentState,
-		TargetState:   targetState,
-		KongClient:    client,
-		StageDelaySec: delay,
-		NoMaskValues:  noMaskValues,
-		IsKonnect:     isKonnect,
-		NoDeletes:     shouldSkipDeletes,
+		CurrentState:       currentState,
+		TargetState:        targetState,
+		KongClient:         client,
+		StageDelaySec:      delay,
+		NoMaskValues:       noMaskValues,
+		IsKonnect:          isKonnect,
+		NoDeletes:          shouldSkipDeletes,
+		SkipSchemaDefaults: isKonnect && skipDefaultsFill,
+		SchemaRegistry:     schemaRegistry,
 	})
 	if err != nil {
 		return 0, err

cmd/root.go

@@ -37,6 +37,8 @@ var (
 
 	konnectRuntimeGroup string
 	konnectControlPlane string
+
+	skipDefaultsFill bool
 )
 
 // NewRootCmd represents the base command when called without any subcommands
@@ -432,6 +434,8 @@ func initKonnectConfig() error {
 		token = strings.TrimRight(token, "\n")
 	}
 
+	skipDefaultsFill = viper.GetBool("skip-defaults-fill")
+
 	disableAnalytics = !viper.GetBool("analytics")
 	konnectConfig.Email = viper.GetString("konnect-email")
 	konnectConfig.Password = password

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/fatih/color v1.18.0
 	github.com/google/go-cmp v0.7.0
 	github.com/kong/go-apiops v0.2.2
-	github.com/kong/go-database-reconciler v1.31.5
+	github.com/kong/go-database-reconciler v1.31.7-0.20260302110444-ed9ab212d32f
 	github.com/kong/go-kong v0.72.1
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/spf13/cobra v1.9.1

go.sum

@@ -249,6 +249,10 @@ github.com/kong/go-apiops v0.2.2 h1:Owdcl/PxTdtciqyZKgPScVhTKHgY2b8dGIC1Bms8NpI=
 github.com/kong/go-apiops v0.2.2/go.mod h1:yPwbl3P2eQinVGAEA0d3legaYmzPJ+WtJf9fSeGF4b8=
 github.com/kong/go-database-reconciler v1.31.5 h1:gQ5ACprRVQkMy0P3akxSHt1iMju0/pxAHfIqKG/U0Qg=
 github.com/kong/go-database-reconciler v1.31.5/go.mod h1:A6BBhnK1AQ7mQAsnLHoAitS62nJRGqUI8NbjC1aRGOc=
+github.com/kong/go-database-reconciler v1.31.7-0.20260302105910-4f907df38e32 h1:wF+RVgmkb/OapArrtyvvbp0vbeS9pBSWu+FUfup+Fdw=
+github.com/kong/go-database-reconciler v1.31.7-0.20260302105910-4f907df38e32/go.mod h1:A6BBhnK1AQ7mQAsnLHoAitS62nJRGqUI8NbjC1aRGOc=
+github.com/kong/go-database-reconciler v1.31.7-0.20260302110444-ed9ab212d32f h1:V2f/loHXw5ERcIkgrO+tchXl/z0kX3R30SX2ESVCF+o=
+github.com/kong/go-database-reconciler v1.31.7-0.20260302110444-ed9ab212d32f/go.mod h1:A6BBhnK1AQ7mQAsnLHoAitS62nJRGqUI8NbjC1aRGOc=
 github.com/kong/go-kong v0.72.1 h1:rQ69f3Wd0Fvc3JANkavo34vePqR4uZG/YQ2y5U7d2Po=
 github.com/kong/go-kong v0.72.1/go.mod h1:J0vGB3wsZ2i99zly1zTRe3v7rOKpkhQZRwbcTFP76qM=
 github.com/kong/go-slugify v1.0.0 h1:vCFAyf2sdoSlBtLcrmDWUFn0ohlpKiKvQfXZkO5vSKY=