From e8878687b18fd961e9f3e29c1c46fe018157a77d Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Fri, 26 Jun 2020 10:36:38 -0500 Subject: [PATCH 1/5] fix S1002 omit comp to bool Signed-off-by: Ken Sipe --- .../src/k8s.io/apiserver/pkg/authorization/union/union.go | 3 ++- .../src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go | 2 +- .../pkg/endpoints/handlers/fieldmanager/capmanagers.go | 2 +- .../k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go | 2 +- .../k8s.io/apiserver/pkg/server/egressselector/config.go | 6 +++--- .../k8s.io/apiserver/pkg/server/options/egress_selector.go | 3 ++- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go index 89d68ffed10..568e503e697 100644 --- a/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go +++ b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go @@ -29,6 +29,7 @@ import ( "strings" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" ) @@ -88,7 +89,7 @@ func (authzHandler unionAuthzRulesHandler) RulesFor(user user.Info, namespace st for _, currAuthzHandler := range authzHandler { resourceRules, nonResourceRules, incomplete, err := currAuthzHandler.RulesFor(user, namespace) - if incomplete == true { + if incomplete { incompleteStatus = true } if err != nil { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go index 0e2650ae9ac..892aaf4a0d2 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete.go @@ -141,7 +141,7 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope *RequestSc // that will break existing clients. // Other cases where resource is not instantly deleted are: namespace deletion // and pod graceful deletion. - if !wasDeleted && options.OrphanDependents != nil && *options.OrphanDependents == false { + if !wasDeleted && options.OrphanDependents != nil && !*options.OrphanDependents { status = http.StatusAccepted } // if the rest.Deleter returns a nil object, fill out a status. Callers may return a valid diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/capmanagers.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/capmanagers.go index 8e926995329..c43f3479677 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/capmanagers.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/capmanagers.go @@ -67,7 +67,7 @@ func (f *capManagersManager) capUpdateManagers(managed Managed) (newManaged Mana // Gather all entries from updates updaters := []string{} for manager, fields := range managed.Fields() { - if fields.Applied() == false { + if !fields.Applied() { updaters = append(updaters, manager) } } diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go index ccf6c74b91d..592733c38f0 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go @@ -1115,7 +1115,7 @@ func (t *Tester) testDeleteGracefulImmediate(obj runtime.Object, createFn Create if err != nil { t.Errorf("unexpected error: %v", err) } - if wasDeleted != true { + if !wasDeleted { t.Errorf("unexpected, object %s should have been deleted immediately", objectMeta.GetName()) } _, err = t.storage.(rest.Getter).Get(ctx, objectMeta.GetName(), &metav1.GetOptions{}) diff --git a/staging/src/k8s.io/apiserver/pkg/server/egressselector/config.go b/staging/src/k8s.io/apiserver/pkg/server/egressselector/config.go index b8b1d67a57a..e608565c076 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/egressselector/config.go +++ b/staging/src/k8s.io/apiserver/pkg/server/egressselector/config.go @@ -199,7 +199,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel return allErrs } if tlsConfig.CABundle != "" { - if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.CABundle); exists == false || err != nil { + if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.CABundle); !exists || err != nil { allErrs = append(allErrs, field.Invalid( fldPath.Child("tlsConfig", "caBundle"), tlsConfig.CABundle, @@ -211,7 +211,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel fldPath.Child("tlsConfig", "clientCert"), "nil", "Using TLS requires clientCert")) - } else if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.ClientCert); exists == false || err != nil { + } else if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.ClientCert); !exists || err != nil { allErrs = append(allErrs, field.Invalid( fldPath.Child("tlsConfig", "clientCert"), tlsConfig.ClientCert, @@ -222,7 +222,7 @@ func validateTLSConfig(tlsConfig *apiserver.TLSConfig, fldPath *field.Path) fiel fldPath.Child("tlsConfig", "clientKey"), "nil", "Using TLS requires requires clientKey")) - } else if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.ClientKey); exists == false || err != nil { + } else if exists, err := path.Exists(path.CheckFollowSymlink, tlsConfig.ClientKey); !exists || err != nil { allErrs = append(allErrs, field.Invalid( fldPath.Child("tlsConfig", "clientKey"), tlsConfig.ClientKey, diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/egress_selector.go b/staging/src/k8s.io/apiserver/pkg/server/options/egress_selector.go index c5e579c3cfb..07999cab116 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/egress_selector.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/egress_selector.go @@ -18,6 +18,7 @@ package options import ( "fmt" + "github.com/spf13/pflag" "k8s.io/utils/path" @@ -84,7 +85,7 @@ func (o *EgressSelectorOptions) Validate() []error { errs := []error{} - if exists, err := path.Exists(path.CheckFollowSymlink, o.ConfigFile); exists == false || err != nil { + if exists, err := path.Exists(path.CheckFollowSymlink, o.ConfigFile); !exists || err != nil { errs = append(errs, fmt.Errorf("egress-selector-config-file %s does not exist", o.ConfigFile)) } From b287287a3093e895a77ccf78053adffcaa7a67c9 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Fri, 26 Jun 2020 10:39:16 -0500 Subject: [PATCH 2/5] fix S1008 simplify bool returns Signed-off-by: Ken Sipe --- .../apiserver/pkg/registry/generic/registry/store.go | 8 +++----- staging/src/k8s.io/apiserver/pkg/server/filters/goaway.go | 6 +----- .../apiserver/pkg/server/storage/resource_config.go | 6 +----- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go index c1464de6457..668161352bb 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go @@ -38,6 +38,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/tools/cache" + genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/rest" @@ -45,7 +47,6 @@ import ( storeerr "k8s.io/apiserver/pkg/storage/errors" "k8s.io/apiserver/pkg/storage/etcd3/metrics" "k8s.io/apiserver/pkg/util/dryrun" - "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" ) @@ -683,10 +684,7 @@ func shouldOrphanDependents(ctx context.Context, e *Store, accessor metav1.Objec } // Get default orphan policy from this REST object type if it exists - if defaultGCPolicy == rest.OrphanDependents { - return true - } - return false + return defaultGCPolicy == rest.OrphanDependents } // shouldDeleteDependents returns true if the finalizer for foreground deletion should be set diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/goaway.go b/staging/src/k8s.io/apiserver/pkg/server/filters/goaway.go index 8b1b5e8ea4d..065bd22bbc9 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/goaway.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/goaway.go @@ -80,9 +80,5 @@ type probabilisticGoawayDecider struct { // Goaway implement GoawayDecider func (p *probabilisticGoawayDecider) Goaway(r *http.Request) bool { - if p.next() < p.chance { - return true - } - - return false + return p.next() < p.chance } diff --git a/staging/src/k8s.io/apiserver/pkg/server/storage/resource_config.go b/staging/src/k8s.io/apiserver/pkg/server/storage/resource_config.go index 0f2d45c9e78..bd85ac230b2 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/storage/resource_config.go +++ b/staging/src/k8s.io/apiserver/pkg/server/storage/resource_config.go @@ -85,11 +85,7 @@ func (o *ResourceConfig) EnableVersions(versions ...schema.GroupVersion) { func (o *ResourceConfig) VersionEnabled(version schema.GroupVersion) bool { enabled, _ := o.GroupVersionConfigs[version] - if enabled { - return true - } - - return false + return enabled } func (o *ResourceConfig) DisableResources(resources ...schema.GroupVersionResource) { From 268c2f81c7ab94cbab68a8d6c00725144b81fa09 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Fri, 26 Jun 2020 10:45:30 -0500 Subject: [PATCH 3/5] fix S1000 simplify ch switch cases Signed-off-by: Ken Sipe --- .../flowcontrol/fairqueuing/queueset/queueset_test.go | 4 +--- .../flowcontrol/fairqueuing/testing/clock/event_clock.go | 9 ++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go index e9c700efcc4..cc02f27a19f 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go @@ -195,9 +195,7 @@ func ClockWait(clk *clock.FakeEventClock, counter counter.GoRoutineCounter, dura close(dunch) }, duration) counter.Add(-1) - select { - case <-dunch: - } + <-dunch } func init() { diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go index 376405433b9..d45a35e5257 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go @@ -25,8 +25,9 @@ import ( "time" "k8s.io/apimachinery/pkg/util/clock" - "k8s.io/apiserver/pkg/util/flowcontrol/counter" "k8s.io/klog/v2" + + "k8s.io/apiserver/pkg/util/flowcontrol/counter" ) // EventFunc does some work that needs to be done at or after the @@ -51,10 +52,8 @@ type RealEventClock struct { func (RealEventClock) EventAfterDuration(f EventFunc, d time.Duration) { ch := time.After(d) go func() { - select { - case t := <-ch: - f(t) - } + t := <-ch + f(t) }() } From ba11567617aa8f00d9be01ce2551c49d153cdadf Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Fri, 26 Jun 2020 10:53:08 -0500 Subject: [PATCH 4/5] fix S1000 simplify ch switch cases Signed-off-by: Ken Sipe --- .../pkg/server/filters/goaway_test.go | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go index ff35f30b9c6..330093e2aae 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/goaway_test.go @@ -113,17 +113,15 @@ func TestClientReceivedGOAWAY(t *testing.T) { count := 0 for { - select { - case <-timer.C: - n, err := w.Write([]byte("w")) - if err != nil { - return - } - flusher.Flush() - count += n - if count == watchExpectSendBytes { - return - } + <-timer.C + n, err := w.Write([]byte("w")) + if err != nil { + return + } + flusher.Flush() + count += n + if count == watchExpectSendBytes { + return } } }) From 09cd56b561d0c31421dfc6374b68e0b18c6cc746 Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Sun, 28 Jun 2020 15:26:40 -0500 Subject: [PATCH 5/5] changes in imports was unintentional Signed-off-by: Ken Sipe --- staging/src/k8s.io/apiserver/pkg/authorization/union/union.go | 1 - .../k8s.io/apiserver/pkg/registry/generic/registry/store.go | 3 +-- .../util/flowcontrol/fairqueuing/testing/clock/event_clock.go | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go index 568e503e697..460d9a4ab57 100644 --- a/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go +++ b/staging/src/k8s.io/apiserver/pkg/authorization/union/union.go @@ -29,7 +29,6 @@ import ( "strings" utilerrors "k8s.io/apimachinery/pkg/util/errors" - "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" ) diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go index 668161352bb..2e0f7d9ecd4 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go @@ -38,8 +38,6 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/tools/cache" - genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/generic" "k8s.io/apiserver/pkg/registry/rest" @@ -47,6 +45,7 @@ import ( storeerr "k8s.io/apiserver/pkg/storage/errors" "k8s.io/apiserver/pkg/storage/etcd3/metrics" "k8s.io/apiserver/pkg/util/dryrun" + "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go index d45a35e5257..c5464986f48 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/testing/clock/event_clock.go @@ -25,9 +25,8 @@ import ( "time" "k8s.io/apimachinery/pkg/util/clock" - "k8s.io/klog/v2" - "k8s.io/apiserver/pkg/util/flowcontrol/counter" + "k8s.io/klog/v2" ) // EventFunc does some work that needs to be done at or after the