diff --git a/.golangci.yml b/.golangci.yml index cdd2defce0..1ebcfa46a0 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,27 +2,22 @@ version: "2" linters: default: standard enable: + - bodyclose + - prealloc - unparam + exclusions: + paths: + - generated.*\.go + - client + - vendor formatters: enable: - - gofmt + - gofumpt - goimports - settings: - gofmt: - rewrite-rules: - - pattern: 'interface{}' - replacement: 'any' issues: max-same-issues: 100 - exclude-files: - - generated.*\\.go - - exclude-dirs: - - client - - vendor - run: timeout: 10m diff --git a/apis/cost/v1alpha1/register.go b/apis/cost/v1alpha1/register.go index 6c51d4e35f..23bac84f43 100644 --- a/apis/cost/v1alpha1/register.go +++ b/apis/cost/v1alpha1/register.go @@ -46,7 +46,8 @@ func Resource(resource string) schema.GroupResource { // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &CostReport{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/apis/offline/v1alpha1/register.go b/apis/offline/v1alpha1/register.go index 12002e7d0c..93a29e3a46 100644 --- a/apis/offline/v1alpha1/register.go +++ b/apis/offline/v1alpha1/register.go @@ -46,7 +46,8 @@ func Resource(resource string) schema.GroupResource { // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &AddOfflineLicense{}, &OfflineLicense{}, &OfflineLicenseList{}, diff --git a/apis/policy/v1alpha1/register.go b/apis/policy/v1alpha1/register.go index 48a550b003..173868b12d 100644 --- a/apis/policy/v1alpha1/register.go +++ b/apis/policy/v1alpha1/register.go @@ -46,7 +46,8 @@ func Resource(resource string) schema.GroupResource { // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &PolicyReport{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index cbe12a85dc..0cd0c4afba 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -159,7 +159,8 @@ func init() { // TODO: keep the generic API server from wanting this unversioned := schema.GroupVersion{Group: "", Version: "v1"} - Scheme.AddUnversionedTypes(unversioned, + Scheme.AddUnversionedTypes( + unversioned, &metav1.Status{}, &metav1.APIVersions{}, &metav1.APIGroupList{}, diff --git a/pkg/cmds/server/start.go b/pkg/cmds/server/start.go index 6dbe2df80f..f589df9d7d 100644 --- a/pkg/cmds/server/start.go +++ b/pkg/cmds/server/start.go @@ -100,8 +100,9 @@ func (o UIServerOptions) AddFlags(fs *pflag.FlagSet) { // Validate validates UIServerOptions func (o UIServerOptions) Validate(args []string) error { - var errors []error - errors = append(errors, o.RecommendedOptions.Validate()...) + recommendedErrors := o.RecommendedOptions.Validate() + errors := make([]error, 0, len(recommendedErrors)+1) + errors = append(errors, recommendedErrors...) errors = append(errors, o.PrometheusOptions.Validate()) return utilerrors.NewAggregate(errors) } @@ -184,7 +185,8 @@ func (o *UIServerOptions) Config() (*apiserver.Config, error) { rscoreapi.GetOpenAPIDefinitions, catalogapi.GetOpenAPIDefinitions, ), - openapi.NewDefinitionNamer(apiserver.Scheme)) + openapi.NewDefinitionNamer(apiserver.Scheme), + ) serverConfig.OpenAPIConfig.Info.Title = "kube-uiapi-server" serverConfig.OpenAPIConfig.Info.Version = v.Version.Version serverConfig.OpenAPIConfig.IgnorePrefixes = ignorePrefixes @@ -194,7 +196,8 @@ func (o *UIServerOptions) Config() (*apiserver.Config, error) { identityapi.GetOpenAPIDefinitions, rscoreapi.GetOpenAPIDefinitions, ), - openapi.NewDefinitionNamer(apiserver.Scheme)) + openapi.NewDefinitionNamer(apiserver.Scheme), + ) serverConfig.OpenAPIV3Config.Info.Title = "kube-uiapi-server" serverConfig.OpenAPIV3Config.Info.Version = v.Version.Version serverConfig.OpenAPIV3Config.IgnorePrefixes = ignorePrefixes diff --git a/pkg/controllers/feature/feature_controller_test.go b/pkg/controllers/feature/feature_controller_test.go index 25f4eda789..4307e0215d 100644 --- a/pkg/controllers/feature/feature_controller_test.go +++ b/pkg/controllers/feature/feature_controller_test.go @@ -402,7 +402,8 @@ func TestFeatureSetStatus(t *testing.T) { Group: uiapi.SchemeGroupVersion.Group, Resource: uiapi.ResourceFeatureSets, }, - ""), + "", + ), }, "Should not be enabled when no features are enabled": { requireFeatures: []string{"foo", "bar"}, diff --git a/pkg/controllers/projectquota/projectquota_controller.go b/pkg/controllers/projectquota/projectquota_controller.go index 791d86bef7..061114493b 100644 --- a/pkg/controllers/projectquota/projectquota_controller.go +++ b/pkg/controllers/projectquota/projectquota_controller.go @@ -393,7 +393,8 @@ func (r *ProjectQuotaReconciler) StartWatcher(rid kmapi.ResourceID) { source.Kind[client.Object]( r.cache, &obj, - handler.EnqueueRequestsFromMapFunc(ProjectQuotaForObjects(r.Client))), + handler.EnqueueRequestsFromMapFunc(ProjectQuotaForObjects(r.Client)), + ), ) if err != nil { klog.Fatalln(err) diff --git a/pkg/graph/setup.go b/pkg/graph/setup.go index 21ebc99748..287802af5f 100644 --- a/pkg/graph/setup.go +++ b/pkg/graph/setup.go @@ -197,7 +197,7 @@ func execRawGraphQLQuery(query string, vars map[string]any) ([]kmapi.ObjectRefer } result := graphql.Do(params) if result.HasErrors() { - var errs []error + errs := make([]error, 0, len(result.Errors)) for _, e := range result.Errors { errs = append(errs, e) } diff --git a/pkg/graph/vars.go b/pkg/graph/vars.go index 9245208c0b..5c55ca2277 100644 --- a/pkg/graph/vars.go +++ b/pkg/graph/vars.go @@ -89,4 +89,5 @@ var gkSet = ksets.NewGroupKind( schema.GroupKind{ Group: "", Kind: "Event", - }) + }, +) diff --git a/pkg/registry/core/project/storage.go b/pkg/registry/core/project/storage.go index b425768cc4..26e35d555d 100644 --- a/pkg/registry/core/project/storage.go +++ b/pkg/registry/core/project/storage.go @@ -294,7 +294,8 @@ func ListRancherProjects(kc client.Client) ([]rscoreapi.Project, error) { prj.Spec.Monitoring.PrometheusURL, "/services/http:rancher-monitoring-prometheus:9090/proxy", "/services/http:rancher-monitoring-grafana:80/proxy/?orgId=1", - 1) + 1, + ) } else { prj.Spec.Monitoring.AlertmanagerURL, prj.Spec.Monitoring.GrafanaURL, diff --git a/pkg/registry/meta/chartpresetquery/storage.go b/pkg/registry/meta/chartpresetquery/storage.go index f222adc057..12d5d203b4 100644 --- a/pkg/registry/meta/chartpresetquery/storage.go +++ b/pkg/registry/meta/chartpresetquery/storage.go @@ -90,7 +90,8 @@ func (r *Storage) Create(ctx context.Context, obj runtime.Object, _ rest.Validat preset.Source.Generation <= 0 { break } - oids = append(oids, fmt.Sprintf("G=%s,K=%s,I=%s,V=%d", + oids = append(oids, fmt.Sprintf( + "G=%s,K=%s,I=%s,V=%d", preset.Source.Resource.Group, preset.Source.Resource.Kind, preset.Source.UID,