From e8878687b18fd961e9f3e29c1c46fe018157a77d Mon Sep 17 00:00:00 2001 From: Ken Sipe Date: Fri, 26 Jun 2020 10:36:38 -0500 Subject: [PATCH] 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)) }