From 998dcbaab349ec70bf4c1ed55c1477e2c3b996c7 Mon Sep 17 00:00:00 2001 From: Mateus Oliveira Date: Mon, 6 Jan 2025 17:23:27 -0300 Subject: [PATCH] :seedling: fix: remove unused nolint comments (#4468) fix: remove unused nolint comments Signed-off-by: Mateus Oliveira --- .golangci.yml | 3 +++ cmd/main.go | 2 -- pkg/cli/api.go | 2 +- pkg/cli/cli_test.go | 1 - pkg/cli/cmd_helpers.go | 6 ++--- pkg/cli/edit.go | 2 +- pkg/cli/webhook.go | 2 +- pkg/model/resource/resource_test.go | 1 - pkg/plugin/util/util.go | 23 +++++++------------ .../common/kustomize/v2/scaffolds/api.go | 2 +- .../config/certmanager/certificate_metrics.go | 2 +- .../config/certmanager/kustomizeconfig.go | 1 - .../templates/config/crd/kustomization.go | 2 +- .../crd/patches/enablecainjection_patch.go | 1 - .../kdefault/cert_metrics_manager_patch.go | 2 +- .../config/kdefault/webhook_manager_patch.go | 3 +-- .../templates/config/prometheus/monitor.go | 2 +- .../common/kustomize/v2/scaffolds/webhook.go | 2 -- .../golang/deploy-image/v1alpha1/api.go | 4 ++-- .../deploy-image/v1alpha1/scaffolds/api.go | 1 - .../scaffolds/internal/templates/api/types.go | 3 ++- .../templates/controllers/controller-test.go | 4 ++-- .../templates/controllers/controller.go | 3 ++- pkg/plugins/golang/options.go | 2 -- .../scaffolds/internal/templates/api/hub.go | 3 ++- .../scaffolds/internal/templates/api/spoke.go | 2 +- .../scaffolds/internal/templates/api/types.go | 3 ++- .../scaffolds/internal/templates/cmd/main.go | 2 +- .../templates/controllers/controller.go | 3 ++- .../controllers/controller_suitetest.go | 3 ++- .../controllers/controller_test_template.go | 3 ++- .../scaffolds/internal/templates/golangci.go | 1 - .../v4/scaffolds/internal/templates/readme.go | 1 - .../internal/templates/test/e2e/test.go | 1 - .../internal/templates/webhooks/webhook.go | 4 ++-- .../templates/webhooks/webhook_suitetest.go | 1 - .../webhooks/webhook_test_template.go | 3 +-- .../optional/grafana/v1alpha/constants.go | 2 +- .../grafana/v1alpha/scaffolds/edit.go | 4 ++-- .../scaffolds/internal/templates/custom.go | 1 - .../internal/templates/custom_metrics.go | 1 - .../scaffolds/internal/templates/resources.go | 1 - .../scaffolds/internal/templates/runtime.go | 2 +- pkg/plugins/optional/helm/v1alpha/edit.go | 2 +- .../templates/chart-templates/helpers_tpl.go | 1 - .../chart-templates/manager/manager.go | 2 +- .../internal/templates/github/test_chart.go | 2 +- test/e2e/deployimage/generate_test.go | 4 ---- test/e2e/utils/webhooks.go | 6 ++--- test/e2e/v4/generate_test.go | 6 ----- test/e2e/v4/plugin_cluster_test.go | 2 +- 51 files changed, 56 insertions(+), 86 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 1cb1356241a..1ec4edba185 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -22,6 +22,8 @@ linters-settings: disable: - fieldalignment - shadow + nolintlint: + allow-unused: false revive: rules: # The following rules are recommended https://github.com/mgechev/revive#recommended-configuration @@ -78,6 +80,7 @@ linters: - ineffassign - lll - misspell + - nolintlint - nakedret - prealloc - revive diff --git a/cmd/main.go b/cmd/main.go index b09c7c836aa..35e9db150aa 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -25,8 +25,6 @@ import ( "sigs.k8s.io/kubebuilder/v4/pkg/plugin" kustomizecommonv2 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2" "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang" - - //nolint:staticcheck deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/deploy-image/v1alpha1" golangv4 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4" grafanav1alpha1 "sigs.k8s.io/kubebuilder/v4/pkg/plugins/optional/grafana/v1alpha" diff --git a/pkg/cli/api.go b/pkg/cli/api.go index 2d43aeec17a..d8e600b145a 100644 --- a/pkg/cli/api.go +++ b/pkg/cli/api.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli //nolint:dupl +package cli import ( "fmt" diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go index e2419518484..9244c151343 100644 --- a/pkg/cli/cli_test.go +++ b/pkg/cli/cli_test.go @@ -60,7 +60,6 @@ func setBoolFlag(flag string) { os.Args = append(os.Args, "subcommand", "--"+flag) } -// nolint:unparam func setProjectVersionFlag(value string) { setFlag(projectVersionFlag, value) } diff --git a/pkg/cli/cmd_helpers.go b/pkg/cli/cmd_helpers.go index a800806eb61..c8bf3ac2fc9 100644 --- a/pkg/cli/cmd_helpers.go +++ b/pkg/cli/cmd_helpers.go @@ -285,7 +285,7 @@ func (factory *executionHooksFactory) preRunEFunc( } // Pre-scaffold hook. - // nolint:revive + //nolint:revive if err := factory.forEach(func(subcommand plugin.Subcommand) error { if subcommand, hasPreScaffold := subcommand.(plugin.HasPreScaffold); hasPreScaffold { return subcommand.PreScaffold(factory.fs) @@ -303,7 +303,7 @@ func (factory *executionHooksFactory) preRunEFunc( func (factory *executionHooksFactory) runEFunc() func(*cobra.Command, []string) error { return func(*cobra.Command, []string) error { // Scaffold hook. - // nolint:revive + //nolint:revive if err := factory.forEach(func(subcommand plugin.Subcommand) error { return subcommand.Scaffold(factory.fs) }, "unable to scaffold with"); err != nil { @@ -323,7 +323,7 @@ func (factory *executionHooksFactory) postRunEFunc() func(*cobra.Command, []stri } // Post-scaffold hook. - // nolint:revive + //nolint:revive if err := factory.forEach(func(subcommand plugin.Subcommand) error { if subcommand, hasPostScaffold := subcommand.(plugin.HasPostScaffold); hasPostScaffold { return subcommand.PostScaffold() diff --git a/pkg/cli/edit.go b/pkg/cli/edit.go index b5a4b8ce706..c66ec185464 100644 --- a/pkg/cli/edit.go +++ b/pkg/cli/edit.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli //nolint:dupl +package cli import ( "fmt" diff --git a/pkg/cli/webhook.go b/pkg/cli/webhook.go index ad4ae80e468..09b563dc7f7 100644 --- a/pkg/cli/webhook.go +++ b/pkg/cli/webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli //nolint:dupl +package cli import ( "fmt" diff --git a/pkg/model/resource/resource_test.go b/pkg/model/resource/resource_test.go index c08e05f8cf7..f65e8f1dbbe 100644 --- a/pkg/model/resource/resource_test.go +++ b/pkg/model/resource/resource_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/gomega" ) -//nolint:dupl var _ = Describe("Resource", func() { const ( group = "group" diff --git a/pkg/plugin/util/util.go b/pkg/plugin/util/util.go index 29619c3d385..80220cef74b 100644 --- a/pkg/plugin/util/util.go +++ b/pkg/plugin/util/util.go @@ -64,8 +64,7 @@ func GetNonEmptyLines(output string) []string { // InsertCode searches target content in the file and insert `toInsert` after the target. func InsertCode(filename, target, code string) error { - // false positive - // nolint:gosec + //nolint:gosec // false positive contents, err := os.ReadFile(filename) if err != nil { return err @@ -75,15 +74,13 @@ func InsertCode(filename, target, code string) error { return fmt.Errorf("string %s not found in %s", target, string(contents)) } out := string(contents[:idx+len(target)]) + code + string(contents[idx+len(target):]) - // false positive - // nolint:gosec + //nolint:gosec // false positive return os.WriteFile(filename, []byte(out), 0644) } // InsertCodeIfNotExist insert code if it does not already exists func InsertCodeIfNotExist(filename, target, code string) error { - // false positive - // nolint:gosec + //nolint:gosec // false positive contents, err := os.ReadFile(filename) if err != nil { return err @@ -130,8 +127,7 @@ func AppendCodeAtTheEnd(filename, code string) error { // UncommentCode searches for target in the file and remove the comment prefix // of the target content. The target content may span multiple lines. func UncommentCode(filename, target, prefix string) error { - // false positive - // nolint:gosec + //nolint:gosec // false positive content, err := os.ReadFile(filename) if err != nil { return err @@ -171,8 +167,7 @@ func UncommentCode(filename, target, prefix string) error { if err != nil { return err } - // false positive - // nolint:gosec + //nolint:gosec // false positive return os.WriteFile(filename, out.Bytes(), 0644) } @@ -232,8 +227,7 @@ func ReplaceInFile(path, oldValue, newValue string) error { if err != nil { return err } - // false positive - // nolint:gosec + //nolint:gosec // false positive b, err := os.ReadFile(path) if err != nil { return err @@ -260,8 +254,7 @@ func ReplaceRegexInFile(path, match, replace string) error { if err != nil { return err } - // false positive - // nolint:gosec + //nolint:gosec // false positive b, err := os.ReadFile(path) if err != nil { return err @@ -279,7 +272,7 @@ func ReplaceRegexInFile(path, match, replace string) error { // HasFileContentWith check if given `text` can be found in file func HasFileContentWith(path, text string) (bool, error) { - // nolint:gosec + //nolint:gosec contents, err := os.ReadFile(path) if err != nil { return false, err diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/api.go b/pkg/plugins/common/kustomize/v2/scaffolds/api.go index 2eeec22ab48..89be77d1422 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/api.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/api.go @@ -91,7 +91,7 @@ func (s *apiScaffolder) Scaffold() error { } } - // nolint:goconst + //nolint:goconst kustomizeFilePath := "config/default/kustomization.yaml" err := pluginutil.UncommentCode(kustomizeFilePath, "#- ../crd", `#`) if err != nil { diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate_metrics.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate_metrics.go index 9b286de7577..61d549d896d 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate_metrics.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate_metrics.go @@ -44,7 +44,7 @@ func (f *MetricsCertificate) SetTemplateDefaults() error { return nil } -// nolint:lll +//nolint:lll const metricsCertManagerTemplate = `# The following manifests contain a self-signed issuer CR and a metrics certificate CR. # More document can be found at https://docs.cert-manager.io apiVersion: cert-manager.io/v1 diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go index a320b19d104..3e4154e815e 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go @@ -43,7 +43,6 @@ func (f *KustomizeConfig) SetTemplateDefaults() error { return nil } -//nolint:lll const kustomizeConfigTemplate = `# This configuration is for teaching kustomize how to update name ref substitution nameReference: - kind: Issuer diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go index e9bba94e314..fa0b7c9e5ff 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go @@ -50,7 +50,7 @@ func (f *Kustomization) SetTemplateDefaults() error { return nil } -//nolint:gosec to ignore false complain G101: Potential hardcoded credentials (gosec) +//nolint:gosec // to ignore false complain G101: Potential hardcoded credentials (gosec) const ( resourceMarker = "crdkustomizeresource" webhookPatchMarker = "crdkustomizewebhookpatch" diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go index 8ac1202f5aa..91222e23905 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go @@ -47,7 +47,6 @@ func (f *EnableCAInjectionPatch) SetTemplateDefaults() error { return nil } -//nolint:lll const enableCAInjectionPatchTemplate = `# The following patch adds a directive for certmanager to inject CA into the CRD apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/cert_metrics_manager_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/cert_metrics_manager_patch.go index 1c6b87409ef..a1f86b2428f 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/cert_metrics_manager_patch.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/cert_metrics_manager_patch.go @@ -50,7 +50,7 @@ func (f *CertManagerMetricsPatch) SetTemplateDefaults() error { return nil } -// nolint:lll +//nolint:lll const metricsManagerPatchTemplate = `# This patch adds the args, volumes, and ports to allow the manager to use the metrics-server certs. # Add the volumeMount for the metrics-server certs diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go index 5d12d4cb26c..2bab0acfe87 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go @@ -50,8 +50,7 @@ func (f *ManagerWebhookPatch) SetTemplateDefaults() error { return nil } -// nolint:lll -// nolint:lll +//nolint:lll const managerWebhookPatchTemplate = `# This patch ensures the webhook certificates are properly mounted in the manager container. # It configures the necessary arguments, volumes, volume mounts, and container ports. diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go index 54bd5e9eb4d..e6a1b54f1c5 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go @@ -41,7 +41,7 @@ func (f *Monitor) SetTemplateDefaults() error { return nil } -// nolint:lll +//nolint:lll const serviceMonitorTemplate = `# Prometheus Monitor Service (Metrics) apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go b/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go index 6991f9ecef8..27635bc1fad 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go @@ -113,7 +113,6 @@ func (s *webhookScaffolder) Scaffold() error { "%s to allow webhook traffic.", policyKustomizeFilePath) } - // nolint:goconst kustomizeFilePath := "config/default/kustomization.yaml" err = pluginutil.UncommentCode(kustomizeFilePath, "#- ../webhook", `#`) if err != nil { @@ -164,7 +163,6 @@ func (s *webhookScaffolder) Scaffold() error { // Deprecated: remove it when go/v4 and/or kustomize/v2 be removed // validateScaffoldedProject will output a message to help users fix their scaffold func validateScaffoldedProject() { - // nolint:goconst kustomizeFilePath := "config/default/kustomization.yaml" hasCertManagerPatch, _ := pluginutil.HasFileContentWith(kustomizeFilePath, "crdkustomizecainjectionpatch") diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/api.go b/pkg/plugins/golang/deploy-image/v1alpha1/api.go index 654881e7689..ff2b001a871 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/api.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/api.go @@ -63,14 +63,14 @@ type createAPISubcommand struct { } func (p *createAPISubcommand) UpdateMetadata(cliMeta plugin.CLIMetadata, subcmdMeta *plugin.SubcommandMetadata) { - // nolint: lll + //nolint:lll subcmdMeta.Description = `Scaffold the code implementation to deploy and manage your Operand which is represented by the API informed and will be reconciled by its controller. This plugin will generate the code implementation to help you out. Note: In general, it’s recommended to have one controller responsible for managing each API created for the project to properly follow the design goals set by Controller Runtime(https://github.com/kubernetes-sigs/controller-runtime). This plugin will work as the common behaviour of the flag --force and will scaffold the API and controller always. Use core types or external APIs is not officially support by default with. ` - // nolint: lll + //nolint:lll subcmdMeta.Examples = fmt.Sprintf(` # Create a frigates API with Group: ship, Version: v1beta1, Kind: Frigate to represent the Image: example.com/frigate:v0.0.1 and its controller with a code to deploy and manage this Operand. diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go index 304cc272334..ec04e461480 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go @@ -53,7 +53,6 @@ type apiScaffolder struct { } // NewDeployImageScaffolder returns a new Scaffolder for declarative -// nolint: lll func NewDeployImageScaffolder(config config.Config, res resource.Resource, image, command, port, runAsUser string, ) plugins.Scaffolder { diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go index a1b8476268e..532775086e9 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go @@ -27,7 +27,8 @@ import ( var _ machinery.Template = &Types{} // Types scaffolds the file that defines the schema for a CRD -// nolint:maligned +// +//nolint:maligned type Types struct { machinery.TemplateMixin machinery.MultiGroupMixin diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go index 98c1ea9d4de..d0233ec472a 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go @@ -27,7 +27,8 @@ import ( var _ machinery.Template = &ControllerTest{} // ControllerTest scaffolds the file that defines tests for the controller for a CRD or a builtin resource -// nolint:maligned +// +//nolint:maligned type ControllerTest struct { machinery.TemplateMixin machinery.MultiGroupMixin @@ -59,7 +60,6 @@ func (f *ControllerTest) SetTemplateDefaults() error { return nil } -//nolint:lll const controllerTestTemplate = `{{ .Boilerplate }} package {{ if and .MultiGroup .Resource.Group }}{{ .Resource.PackageName }}{{ else }}{{ .PackageName }}{{ end }} diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go index ba19ea87aeb..1a4bd479bc5 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go @@ -27,7 +27,8 @@ import ( var _ machinery.Template = &Controller{} // Controller scaffolds the file that defines the controller for a CRD or a builtin resource -// nolint:maligned +// +//nolint:maligned type Controller struct { machinery.TemplateMixin machinery.MultiGroupMixin diff --git a/pkg/plugins/golang/options.go b/pkg/plugins/golang/options.go index a25415a03a3..f6f084c3708 100644 --- a/pkg/plugins/golang/options.go +++ b/pkg/plugins/golang/options.go @@ -84,7 +84,6 @@ func (opts Options) UpdateResource(res *resource.Resource, c config.Config) { } if opts.DoAPI { - //nolint:staticcheck res.Path = resource.APIPackagePath(c.GetRepository(), res.Group, res.Version, c.IsMultiGroup()) res.API = &resource.API{ @@ -99,7 +98,6 @@ func (opts Options) UpdateResource(res *resource.Resource, c config.Config) { } if opts.DoDefaulting || opts.DoValidation || opts.DoConversion { - //nolint:staticcheck res.Path = resource.APIPackagePath(c.GetRepository(), res.Group, res.Version, c.IsMultiGroup()) res.Webhooks.WebhookVersion = "v1" diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/hub.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/hub.go index df2e4d4e1e0..01458b41ba4 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/hub.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/hub.go @@ -27,7 +27,8 @@ import ( var _ machinery.Template = &Hub{} // Hub scaffolds the file that defines hub -// nolint:maligned +// +//nolint:maligned type Hub struct { machinery.TemplateMixin machinery.MultiGroupMixin diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/spoke.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/spoke.go index 16d37db0576..62d3daa5c9e 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/spoke.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/spoke.go @@ -62,7 +62,7 @@ func (f *Spoke) SetTemplateDefaults() error { return nil } -// nolint:lll +//nolint:lll const spokeTemplate = `{{ .Boilerplate }} package {{ .SpokeVersion }} diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go index bcda7154f68..7c0d506af6b 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go @@ -27,7 +27,8 @@ import ( var _ machinery.Template = &Types{} // Types scaffolds the file that defines the schema for a CRD -// nolint:maligned +// +//nolint:maligned type Types struct { machinery.TemplateMixin machinery.MultiGroupMixin diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/cmd/main.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/cmd/main.go index d859b9b239f..c455ed663f4 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/cmd/main.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/cmd/main.go @@ -217,7 +217,7 @@ func (f *MainUpdater) GetCodeFragments() machinery.CodeFragmentsMap { return fragments } -// nolint:lll +//nolint:lll var mainTemplate = `{{ .Boilerplate }} package main diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller.go index 90d75811bfa..9b2ddc3b0b7 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller.go @@ -27,7 +27,8 @@ import ( var _ machinery.Template = &Controller{} // Controller scaffolds the file that defines the controller for a CRD or a builtin resource -// nolint:maligned +// +//nolint:maligned type Controller struct { machinery.TemplateMixin machinery.MultiGroupMixin diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go index fee33683adc..2b4ad197a5e 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go @@ -29,7 +29,8 @@ var _ machinery.Template = &SuiteTest{} var _ machinery.Inserter = &SuiteTest{} // SuiteTest scaffolds the file that sets up the controller tests -// nolint:maligned +// +//nolint:maligned type SuiteTest struct { machinery.TemplateMixin machinery.MultiGroupMixin diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go index 9446ecca866..ce7b46abf2e 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go @@ -27,7 +27,8 @@ import ( var _ machinery.Template = &ControllerTest{} // ControllerTest scaffolds the file that sets up the controller unit tests -// nolint:maligned +// +//nolint:maligned type ControllerTest struct { machinery.TemplateMixin machinery.MultiGroupMixin diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go index faa9efc0f17..6fa9741980a 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go @@ -41,7 +41,6 @@ func (f *Golangci) SetTemplateDefaults() error { return nil } -//nolint:lll const golangciTemplate = `run: timeout: 5m allow-parallel-runners: true diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go index 09598f8236a..1183bcec82e 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/readme.go @@ -64,7 +64,6 @@ func (f *Readme) SetTemplateDefaults() error { return nil } -//nolint:lll const readmeFileTemplate = `# {{ .ProjectName }} // TODO(user): Add simple overview of use/purpose diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go index 5aec045f4fd..4774ecc2108 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go @@ -143,7 +143,6 @@ const mutatingWebhookChecksFragment = `It("should have CA injection for mutating ` -// nolint:lll const validatingWebhookChecksFragment = `It("should have CA injection for validating webhooks", func() { By("checking CA injection for validating webhooks") verifyCAInjection := func(g Gomega) { diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook.go index c7b5898fdf3..5f71f400fa3 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook.go @@ -28,7 +28,7 @@ import ( var _ machinery.Template = &Webhook{} // Webhook scaffolds the file that defines a webhook for a CRD or a builtin resource -type Webhook struct { // nolint:maligned +type Webhook struct { //nolint:maligned machinery.TemplateMixin machinery.MultiGroupMixin machinery.BoilerplateMixin @@ -53,7 +53,7 @@ type Webhook struct { // nolint:maligned func (f *Webhook) SetTemplateDefaults() error { if f.Path == "" { // Deprecated: Remove me when remove go/v4 - // nolint:goconst + //nolint:goconst baseDir := "api" if !f.IsLegacyPath { baseDir = filepath.Join("internal", "webhook") diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_suitetest.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_suitetest.go index ff232a97a3b..4195108abf6 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_suitetest.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_suitetest.go @@ -56,7 +56,6 @@ type WebhookSuite struct { //nolint:maligned func (f *WebhookSuite) SetTemplateDefaults() error { if f.Path == "" { // Deprecated: Remove me when remove go/v4 - // nolint:goconst baseDir := "api" if !f.IsLegacyPath { baseDir = filepath.Join("internal", "webhook") diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_test_template.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_test_template.go index bdf31e092d3..4439a810ce0 100644 --- a/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_test_template.go +++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_test_template.go @@ -29,7 +29,7 @@ import ( var _ machinery.Template = &WebhookTest{} // WebhookTest scaffolds the file that sets up the webhook unit tests -type WebhookTest struct { // nolint:maligned +type WebhookTest struct { //nolint:maligned machinery.TemplateMixin machinery.MultiGroupMixin machinery.BoilerplateMixin @@ -48,7 +48,6 @@ type WebhookTest struct { // nolint:maligned func (f *WebhookTest) SetTemplateDefaults() error { if f.Path == "" { // Deprecated: Remove me when remove go/v4 - // nolint:goconst baseDir := "api" if !f.IsLegacyPath { baseDir = filepath.Join("internal", "webhook") diff --git a/pkg/plugins/optional/grafana/v1alpha/constants.go b/pkg/plugins/optional/grafana/v1alpha/constants.go index a3764656be1..402cecbafed 100644 --- a/pkg/plugins/optional/grafana/v1alpha/constants.go +++ b/pkg/plugins/optional/grafana/v1alpha/constants.go @@ -16,7 +16,7 @@ limitations under the License. package v1alpha -// nolint: lll +//nolint:lll const metaDataDescription = `This command will add Grafana manifests to the project: - A JSON file includes dashboard manifest that can be directly copied to Grafana Web UI. ('grafana/controller-runtime-metrics.json') diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go index 26a1a19e009..da3707d4c1f 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/edit.go @@ -62,7 +62,7 @@ func loadConfig(configPath string) ([]templates.CustomMetricItem, error) { return nil, nil } - // nolint:gosec + //nolint:gosec f, err := os.Open(configPath) if err != nil { return nil, fmt.Errorf("error loading plugin config: %w", err) @@ -136,7 +136,7 @@ func fillMissingExpr(item templates.CustomMetricItem) templates.CustomMetricItem case "counter": item.Expr = "sum(rate(" + item.Metric + `{job=\"$job\", namespace=\"$namespace\"}[5m])) by (instance, pod)` case "histogram": - // nolint: lll + //nolint:lll item.Expr = "histogram_quantile(0.90, sum by(instance, le) (rate(" + item.Metric + `{job=\"$job\", namespace=\"$namespace\"}[5m])))` default: // gauge item.Expr = item.Metric diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom.go index 68b4c61393a..faa8dcb73bc 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom.go @@ -39,7 +39,6 @@ func (f *CustomMetricsConfigManifest) SetTemplateDefaults() error { return nil } -// nolint: lll const customMetricsConfigTemplate = `--- customMetrics: # - metric: # Raw custom metric (required) diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom_metrics.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom_metrics.go index dd79213efbb..9cdece75a2d 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom_metrics.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/custom_metrics.go @@ -84,7 +84,6 @@ func (f *CustomMetricsDashManifest) createTemplate() (string, error) { return outputTmpl.String(), nil } -// nolint: lll const customMetricsDashTemplate = `{ "__inputs": [ { diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/resources.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/resources.go index 6eb509409ef..928593a2609 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/resources.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/resources.go @@ -45,7 +45,6 @@ func (f *ResourcesManifest) SetTemplateDefaults() error { return nil } -// nolint: lll const controllerResourcesTemplate = `{ "__inputs": [ { diff --git a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go index 18307d7b1f5..8973ac8fb45 100644 --- a/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go +++ b/pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go @@ -44,7 +44,7 @@ func (f *RuntimeManifest) SetTemplateDefaults() error { return nil } -// nolint: lll +//nolint:lll const controllerRuntimeTemplate = `{ "__inputs": [ { diff --git a/pkg/plugins/optional/helm/v1alpha/edit.go b/pkg/plugins/optional/helm/v1alpha/edit.go index aba26fc9ef4..1a497eb0c13 100644 --- a/pkg/plugins/optional/helm/v1alpha/edit.go +++ b/pkg/plugins/optional/helm/v1alpha/edit.go @@ -33,7 +33,7 @@ type editSubcommand struct { force bool } -// nolint:lll +//nolint:lll func (p *editSubcommand) UpdateMetadata(cliMeta plugin.CLIMetadata, subcmdMeta *plugin.SubcommandMetadata) { subcmdMeta.Description = `Initialize or update a Helm chart to distribute the project under the dist/ directory. diff --git a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/helpers_tpl.go b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/helpers_tpl.go index 35540a8df08..42d6c9f245f 100644 --- a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/helpers_tpl.go +++ b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/helpers_tpl.go @@ -43,7 +43,6 @@ func (f *HelmHelpers) SetTemplateDefaults() error { return nil } -// nolint:lll const helmHelpersTemplate = `{{` + "`" + `{{- define "chart.name" -}}` + "`" + `}} {{` + "`" + `{{- if .Chart }}` + "`" + `}} {{` + "`" + `{{- if .Chart.Name }}` + "`" + `}} diff --git a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go index 1dedeedc4e1..fc0d784c8ab 100644 --- a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go +++ b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/chart-templates/manager/manager.go @@ -54,7 +54,7 @@ func (f *Deployment) SetTemplateDefaults() error { return nil } -// nolint:lll +//nolint:lll const managerDeploymentTemplate = `apiVersion: apps/v1 kind: Deployment metadata: diff --git a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/github/test_chart.go b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/github/test_chart.go index 86aac141813..ef9eddee6ed 100644 --- a/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/github/test_chart.go +++ b/pkg/plugins/optional/helm/v1alpha/scaffolds/internal/templates/github/test_chart.go @@ -43,7 +43,7 @@ func (f *HelmChartCI) SetTemplateDefaults() error { return nil } -// nolint:lll +//nolint:lll const testChartTemplate = `name: Test Chart on: diff --git a/test/e2e/deployimage/generate_test.go b/test/e2e/deployimage/generate_test.go index b3d5be9ec4e..845babfa315 100644 --- a/test/e2e/deployimage/generate_test.go +++ b/test/e2e/deployimage/generate_test.go @@ -20,10 +20,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - //nolint:golint - // nolint:revive - //nolint:golint - // nolint:revive "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) diff --git a/test/e2e/utils/webhooks.go b/test/e2e/utils/webhooks.go index f338d722054..41052c2b495 100644 --- a/test/e2e/utils/webhooks.go +++ b/test/e2e/utils/webhooks.go @@ -25,8 +25,7 @@ import ( // ImplementWebhooks will mock an webhook data func ImplementWebhooks(filename, lowerKind string) error { - // false positive - // nolint:gosec + //nolint:gosec // false positive bs, err := os.ReadFile(filename) if err != nil { return err @@ -74,7 +73,6 @@ func ImplementWebhooks(filename, lowerKind string) error { if err != nil { return err } - // false positive - // nolint:gosec + //nolint:gosec // false positive return os.WriteFile(filename, []byte(str), 0644) } diff --git a/test/e2e/v4/generate_test.go b/test/e2e/v4/generate_test.go index 8421402bac2..6051dd3c5be 100644 --- a/test/e2e/v4/generate_test.go +++ b/test/e2e/v4/generate_test.go @@ -25,11 +25,6 @@ import ( . "github.com/onsi/gomega" pluginutil "sigs.k8s.io/kubebuilder/v4/pkg/plugin/util" - - //nolint:golint - // nolint:revive - //nolint:golint - // nolint:revive "sigs.k8s.io/kubebuilder/v4/test/e2e/utils" ) @@ -248,7 +243,6 @@ const metricsTarget = `- path: manager_metrics_patch.yaml target: kind: Deployment` -//nolint:lll const certManagerTarget = `# - source: # Uncomment the following block if you have any webhook # kind: Service # version: v1 diff --git a/test/e2e/v4/plugin_cluster_test.go b/test/e2e/v4/plugin_cluster_test.go index 0db654a9e3c..f39c9cf4a7f 100644 --- a/test/e2e/v4/plugin_cluster_test.go +++ b/test/e2e/v4/plugin_cluster_test.go @@ -568,7 +568,7 @@ func metricsShouldBeUnavailable(kbc *utils.TestContext) { } func cmdOptsToCreateCurlPod(kbc *utils.TestContext, token string) []string { - // nolint:lll + //nolint:lll cmdOpts := []string{ "run", "curl", "--restart=Never",