From 0c67c5ca49a8128ac63c68e57221058b869e90d7 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Fri, 28 Jan 2022 16:12:00 +0100 Subject: [PATCH] tools: Move external packages constant to top level --- tools/proto-annotations/cmd/etcd_version.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/proto-annotations/cmd/etcd_version.go b/tools/proto-annotations/cmd/etcd_version.go index 9d6f8658a..bd86e5a50 100644 --- a/tools/proto-annotations/cmd/etcd_version.go +++ b/tools/proto-annotations/cmd/etcd_version.go @@ -27,6 +27,11 @@ import ( "google.golang.org/protobuf/reflect/protoregistry" ) +var ( + // externalPackages that are not expected to have etcd version annotation. + externalPackages = []string{"io.prometheus.client", "grpc.binarylog.v1", "google.protobuf", "google.rpc", "google.api"} +) + // printEtcdVersion writes etcd_version proto annotation to stdout and returns any errors encountered when reading annotation. func printEtcdVersion() []error { var errs []error @@ -59,10 +64,11 @@ func printEtcdVersion() []error { func allEtcdVersionAnnotations() (annotations []etcdVersionAnnotation, err error) { var fileAnnotations []etcdVersionAnnotation protoregistry.GlobalFiles.RangeFiles(func(file protoreflect.FileDescriptor) bool { - switch string(file.Package()) { - // Skip external packages that are not expected to have etcd version annotation. - case "io.prometheus.client", "grpc.binarylog.v1", "google.protobuf", "google.rpc", "google.api": - return true + pkg := string(file.Package()) + for _, externalPkg := range externalPackages { + if pkg == externalPkg { + return true + } } fileAnnotations, err = fileEtcdVersionAnnotations(file) if err != nil {