fix(confix): correctly distinguish server/v2 config (backport #22780) (#22781)

mergify[bot] · web-flow · commit 8b4dd8ee34e7 · 2024-12-06T07:21:26.000+01:00
diff --git a/tools/confix/upgrade.go b/tools/confix/upgrade.go
@@ -44,7 +44,7 @@ func Upgrade(ctx context.Context, plan transform.Plan, doc *tomledit.Document, c
 	}
 
 	// ignore validation for serverv2 by checking any default field found in doc
-	isServerV2 := doc.First(strings.Split("store.options.ss-pruning-option", ".")...) != nil
+	isServerV2 := doc.First(strings.Split("store.options.sc-pruning-option", ".")...) != nil
 
 	// allow to skip validation
 	if !skipValidate && !isServerV2 {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func Upgrade(ctx context.Context, plan transform.Plan, doc *tomledit.Document, c`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// ignore validation for serverv2 by checking any default field found in doc`
`47`		`- isServerV2 := doc.First(strings.Split("store.options.ss-pruning-option", ".")...) != nil`
	`47`	`+ isServerV2 := doc.First(strings.Split("store.options.sc-pruning-option", ".")...) != nil`
`48`	`48`
`49`	`49`	`// allow to skip validation`
`50`	`50`	`if !skipValidate && !isServerV2 {`