diff --git a/Makefile b/Makefile index 6a5c4c2..5852a93 100644 --- a/Makefile +++ b/Makefile @@ -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 . diff --git a/internal/configtxlator/update/update.go b/internal/configtxlator/update/update.go index bc3169e..f23e370 100644 --- a/internal/configtxlator/update/update.go +++ b/internal/configtxlator/update/update.go @@ -165,23 +165,23 @@ 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) @@ -189,17 +189,17 @@ func computeGroupUpdate(original, updated *common.ConfigGroup) (readSet, writeSe 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) {