Skip to content

Fix Go formatting #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bestbeforetoday merged 1 commit into from
Aug 30, 2026
+29 −25
Merged

Fix Go formatting #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ escapes_detect:
generate:
go install go.uber.org/mock/mockgen@v0.6.0
go generate ./pkg/...

.PHONY: format-go
format-go:
cd '$(base_dir)' && gofmt -l -s -w .
50 changes: 25 additions & 25 deletions internal/configtxlator/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,41 +165,41 @@ func computeGroupUpdate(original, updated *common.ConfigGroup) (readSet, writeSe
// If there were no modified entries in any of the policies/values/groups maps
if len(readSetPolicies)+len(writeSetPolicies)+len(readSetValues)+len(writeSetValues)+len(readSetGroups)+len(writeSetGroups) == 0 {
return &common.ConfigGroup{
Version: original.GetVersion(),
}, &common.ConfigGroup{
Version: original.GetVersion(),
}, false
Version: original.GetVersion(),
}, &common.ConfigGroup{
Version: original.GetVersion(),
}, false
}

return &common.ConfigGroup{
Version: original.GetVersion(),
Policies: readSetPolicies,
Values: readSetValues,
Groups: readSetGroups,
}, &common.ConfigGroup{
Version: original.GetVersion(),
Policies: writeSetPolicies,
Values: writeSetValues,
Groups: writeSetGroups,
}, true
Version: original.GetVersion(),
Policies: readSetPolicies,
Values: readSetValues,
Groups: readSetGroups,
}, &common.ConfigGroup{
Version: original.GetVersion(),
Policies: writeSetPolicies,
Values: writeSetValues,
Groups: writeSetGroups,
}, true
}

copyMap(sameSetPolicies, readSetPolicies, writeSetPolicies)
copyMap(sameSetValues, readSetValues, writeSetValues)
copyMap(sameSetGroups, readSetGroups, writeSetGroups)

return &common.ConfigGroup{
Version: original.GetVersion(),
Policies: readSetPolicies,
Values: readSetValues,
Groups: readSetGroups,
}, &common.ConfigGroup{
Version: original.GetVersion() + 1,
Policies: writeSetPolicies,
Values: writeSetValues,
Groups: writeSetGroups,
ModPolicy: updated.GetModPolicy(),
}, true
Version: original.GetVersion(),
Policies: readSetPolicies,
Values: readSetValues,
Groups: readSetGroups,
}, &common.ConfigGroup{
Version: original.GetVersion() + 1,
Policies: writeSetPolicies,
Values: writeSetValues,
Groups: writeSetGroups,
ModPolicy: updated.GetModPolicy(),
}, true
}

func copyMap[K comparable, V any](source map[K]V, targets ...map[K]V) {
Expand Down
Loading