This is an automated email from the ASF dual-hosted git repository.

squakez pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 149aa0437602155ad184b3ffac7c6e8fca7790d6
Author: UchihaIthachi <[email protected]>
AuthorDate: Fri Nov 6 14:29:47 2026 +0530

    fix(ci): enable complexity linters at default thresholds, mark existing 
outliers with nolint
    
    Signed-off-by: UchihaIthachi <[email protected]>
---
 .golangci.yml                                              | 9 +++------
 pkg/apis/camel/v1/build_types_support.go                   | 2 ++
 pkg/cmd/bind.go                                            | 1 +
 pkg/cmd/modeline.go                                        | 1 +
 pkg/cmd/run.go                                             | 1 +
 pkg/controller/build/monitor_pod.go                        | 2 ++
 pkg/controller/integration/build_kit.go                    | 1 +
 pkg/controller/integrationkit/integrationkit_controller.go | 2 ++
 pkg/controller/pipe/integration.go                         | 2 ++
 pkg/trait/builder.go                                       | 1 +
 pkg/trait/camel.go                                         | 2 +-
 pkg/trait/gc.go                                            | 2 ++
 pkg/trait/init_containers.go                               | 1 +
 pkg/trait/jvm.go                                           | 2 ++
 pkg/trait/knative_service.go                               | 1 +
 pkg/trait/mount.go                                         | 2 ++
 pkg/util/digest/digest.go                                  | 2 ++
 pkg/util/kubernetes/log/pod_scraper.go                     | 2 +-
 pkg/util/kubernetes/portforward.go                         | 1 +
 pkg/util/source/inspector.go                               | 2 ++
 pkg/util/source/inspector_xml.go                           | 2 ++
 pkg/util/source/inspector_yaml.go                          | 2 +-
 22 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 5c53106b3..ff455dd27 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -45,19 +45,16 @@ linters:
     - gomodguard
   settings:
     cyclop:
-      # Current maximum in non-generated code; lower it as the outliers get 
refactored.
-      max-complexity: 47
+      max-complexity: 30
     gocognit:
-      # Current maximum: source (YAMLInspector).parseStep.
-      min-complexity: 132
+      min-complexity: 30
     goconst:
       min-len: 4
       min-occurrences: 10
       ignore-calls: true
       numbers: false
     gocyclo:
-      # Current maximum: source (YAMLInspector).parseStep.
-      min-complexity: 46
+      min-complexity: 30
     lll:
       line-length: 170
     mnd:
diff --git a/pkg/apis/camel/v1/build_types_support.go 
b/pkg/apis/camel/v1/build_types_support.go
index 1822fb33d..dc8791af9 100644
--- a/pkg/apis/camel/v1/build_types_support.go
+++ b/pkg/apis/camel/v1/build_types_support.go
@@ -267,6 +267,8 @@ func (bl *BuildList) HasScheduledBuildsBefore(build *Build) 
(bool, *Build) {
 
 // HasMatchingBuild visit all items in the list of builds and search for a 
scheduled build that matches the given build's dependencies.
 // It returns the first matching build found regardless it may have any one 
more appropriate.
+//
+//nolint:gocognit
 func (bl *BuildList) HasMatchingBuild(build *Build) (bool, *Build) {
        required := build.BuilderDependencies()
        if len(required) == 0 {
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index 4f2be292f..93badda1e 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -172,6 +172,7 @@ func (o *bindCmdOptions) validate(cmd *cobra.Command, args 
[]string) error {
        return trait.ValidateTraits(catalog, extractTraitNames(o.Traits))
 }
 
+//nolint:gocognit
 func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error {
        client, err := o.GetCmdClient()
        if err != nil {
diff --git a/pkg/cmd/modeline.go b/pkg/cmd/modeline.go
index bd2704762..646f3a56e 100644
--- a/pkg/cmd/modeline.go
+++ b/pkg/cmd/modeline.go
@@ -90,6 +90,7 @@ func NewKamelWithModelineCommand(ctx context.Context, osArgs 
[]string) (*cobra.C
        return rootCmd, flags, nil
 }
 
+//nolint:gocognit
 func createKamelWithModelineCommand(ctx context.Context, args []string) 
(*cobra.Command, []string, error) {
        rootCmd, err := NewKamelCommand(ctx)
        if err != nil {
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index d1cd83054..d156ddc61 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -419,6 +419,7 @@ func (o *runCmdOptions) waitForIntegrationPhase(cmd 
*cobra.Command, c client.Cli
        return watch.HandleIntegrationStateChanges(o.Context, c, integration, 
handler)
 }
 
+//nolint:gocognit
 func (o *runCmdOptions) createOrUpdateIntegration(cmd *cobra.Command, c 
client.Client, sources []string) (*v1.Integration, error) {
        namespace := o.Namespace
        name, err := o.GetIntegrationName(sources)
diff --git a/pkg/controller/build/monitor_pod.go 
b/pkg/controller/build/monitor_pod.go
index be0b60d7b..e00d2cb18 100644
--- a/pkg/controller/build/monitor_pod.go
+++ b/pkg/controller/build/monitor_pod.go
@@ -62,6 +62,8 @@ func (action *monitorPodAction) CanHandle(build *v1.Build) 
bool {
 }
 
 // Handle handles the builds.
+//
+//nolint:gocognit
 func (action *monitorPodAction) Handle(ctx context.Context, build *v1.Build) 
(*v1.Build, error) {
        pod, err := getBuilderPod(ctx, action.reader, build)
        if err != nil {
diff --git a/pkg/controller/integration/build_kit.go 
b/pkg/controller/integration/build_kit.go
index 0965f2897..378c12251 100644
--- a/pkg/controller/integration/build_kit.go
+++ b/pkg/controller/integration/build_kit.go
@@ -43,6 +43,7 @@ func (action *buildKitAction) CanHandle(integration 
*v1.Integration) bool {
        return integration.Status.Phase == v1.IntegrationPhaseBuildingKit
 }
 
+//nolint:gocognit
 func (action *buildKitAction) Handle(ctx context.Context, integration 
*v1.Integration) (*v1.Integration, error) {
        // TODO: we may need to add a timeout strategy, i.e give up after some 
time in case of an unrecoverable error.
        secrets, configmaps := 
getIntegrationSecretAndConfigmapResourceVersions(ctx, action.client, 
integration)
diff --git a/pkg/controller/integrationkit/integrationkit_controller.go 
b/pkg/controller/integrationkit/integrationkit_controller.go
index aeea87ac4..45144c2d3 100644
--- a/pkg/controller/integrationkit/integrationkit_controller.go
+++ b/pkg/controller/integrationkit/integrationkit_controller.go
@@ -149,6 +149,8 @@ type reconcileIntegrationKit struct {
 // Note:
 // The Controller will requeue the Request to be processed again if the 
returned error is non-nil or
 // Result.Requeue is true, otherwise upon completion it will remove the work 
from the queue.
+//
+//nolint:gocognit
 func (r *reconcileIntegrationKit) Reconcile(ctx context.Context, request 
reconcile.Request) (reconcile.Result, error) {
        rlog := Log.WithValues("request-namespace", request.Namespace, 
"request-name", request.Name)
        rlog.Debug("Reconciling IntegrationKit")
diff --git a/pkg/controller/pipe/integration.go 
b/pkg/controller/pipe/integration.go
index 17cd41fe0..c1e26f0a3 100644
--- a/pkg/controller/pipe/integration.go
+++ b/pkg/controller/pipe/integration.go
@@ -41,6 +41,8 @@ var (
 )
 
 // CreateIntegrationFor creates and Integration from a Pipe.
+//
+//nolint:cyclop,gocognit,gocyclo
 func CreateIntegrationFor(ctx context.Context, c client.Client, pipe *v1.Pipe) 
(*v1.Integration, error) {
        controller := true
        blockOwnerDeletion := true
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index 7cc73aade..b1a1f57a7 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -249,6 +249,7 @@ func failIntegrationKit(e *Environment, conditionType 
v1.IntegrationKitCondition
        return nil
 }
 
+//nolint:gocognit
 func (t *builderTrait) builderTask(e *Environment, taskConf 
*v1.BuildConfiguration) (*v1.BuilderTask, error) {
        maven := e.Platform.Maven
 
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index 97497b34a..26a5ebbf9 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -142,7 +142,7 @@ func (t *camelTrait) Apply(e *Environment) error {
        return nil
 }
 
-//nolint:nestif
+//nolint:gocognit,nestif
 func (t *camelTrait) loadOrCreateCatalog(e *Environment) error {
        catalogNamespace := e.DetermineCatalogNamespace()
        if catalogNamespace == "" {
diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go
index ba9ff4e91..a81525e02 100644
--- a/pkg/trait/gc.go
+++ b/pkg/trait/gc.go
@@ -246,6 +246,8 @@ func canBeDeleted(it *v1.Integration, u 
unstructured.Unstructured) bool {
 
 // getDeletableTypes returns the list of deletable types resources, inspecting 
the rules for which the operator SA is allowed in the
 // Integration namespace.
+//
+//nolint:gocognit
 func (t *gcTrait) getDeletableTypes(e *Environment) 
(map[schema.GroupVersionKind]struct{}, error) {
        lock.Lock()
        defer lock.Unlock()
diff --git a/pkg/trait/init_containers.go b/pkg/trait/init_containers.go
index 687048268..e177d9cc3 100644
--- a/pkg/trait/init_containers.go
+++ b/pkg/trait/init_containers.go
@@ -62,6 +62,7 @@ func newInitContainersTrait() Trait {
        }
 }
 
+//nolint:gocognit
 func (t *initContainersTrait) Configure(e *Environment) (bool, 
*TraitCondition, error) {
        if e.Integration == nil || !e.IntegrationInRunningPhases() {
                return false, nil, nil
diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go
index 02c0771b1..0f97dec6e 100644
--- a/pkg/trait/jvm.go
+++ b/pkg/trait/jvm.go
@@ -304,6 +304,8 @@ func extractExistingClasspathItems(container 
*corev1.Container) []string {
 
 // Translate HTTP proxy environment variables, that are set by the environment 
trait,
 // into corresponding JVM system properties.
+//
+//nolint:gocognit
 func (t *jvmTrait) prepareHTTPProxy(container *corev1.Container) ([]string, 
error) {
        var args []string
 
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
index adb1704e8..cffac5c70 100644
--- a/pkg/trait/knative_service.go
+++ b/pkg/trait/knative_service.go
@@ -149,6 +149,7 @@ func (t *knativeServiceTrait) 
ControllerStrategySelectorOrder() int {
        return knativeServiceStrategySelectorOrder
 }
 
+//nolint:gocognit
 func (t *knativeServiceTrait) getServiceFor(e *Environment) (*serving.Service, 
error) {
        serviceAnnotations := make(map[string]string)
        if e.Integration.Annotations != nil {
diff --git a/pkg/trait/mount.go b/pkg/trait/mount.go
index 9d32962fa..5bb4a4c40 100644
--- a/pkg/trait/mount.go
+++ b/pkg/trait/mount.go
@@ -142,6 +142,8 @@ func (t *mountTrait) Apply(e *Environment) error {
 
 // configureVolumesAndMounts is in charge to mount volumes and mounts coming 
from the trait configuration.
 // icnts holds the InitContainers which also require to be mounted with the 
shared volumes.
+//
+//nolint:gocognit
 func (t *mountTrait) configureVolumesAndMounts(
        e *Environment,
        vols *[]corev1.Volume,
diff --git a/pkg/util/digest/digest.go b/pkg/util/digest/digest.go
index 3b66a1745..b87df8788 100644
--- a/pkg/util/digest/digest.go
+++ b/pkg/util/digest/digest.go
@@ -45,6 +45,8 @@ const (
 
 // ComputeForIntegration a digest of the fields that are relevant for the 
deployment
 // Produces a digest that can be used as docker image tag.
+//
+//nolint:cyclop,gocognit,gocyclo
 func ComputeForIntegration(integration *v1.Integration, configmapVersions 
[]string, secretVersions []string) (string, error) {
        hash := sha256.New()
        // Integration version is relevant
diff --git a/pkg/util/kubernetes/log/pod_scraper.go 
b/pkg/util/kubernetes/log/pod_scraper.go
index 5221f2fd1..a6d9ee16f 100644
--- a/pkg/util/kubernetes/log/pod_scraper.go
+++ b/pkg/util/kubernetes/log/pod_scraper.go
@@ -149,7 +149,7 @@ func (s *PodScraper) handleAndRestart(ctx context.Context, 
err error, wait time.
 // waitForPodRunning waits for a given pod to reach the running state.
 // It may return the internal container to watch if present.
 //
-//nolint:nestif
+//nolint:gocognit,nestif
 func (s *PodScraper) waitForPodRunning(ctx context.Context, namespace string, 
podName string, defaultContainerName string) (string, error) {
        pod := corev1.Pod{
                Kind:       "Pod",
diff --git a/pkg/util/kubernetes/portforward.go 
b/pkg/util/kubernetes/portforward.go
index 7af004eb3..8c1983262 100644
--- a/pkg/util/kubernetes/portforward.go
+++ b/pkg/util/kubernetes/portforward.go
@@ -35,6 +35,7 @@ import (
        "k8s.io/client-go/transport/spdy"
 )
 
+//nolint:gocognit
 func PortForward(ctx context.Context, c client.Client, ns, labelSelector 
string, localPort, remotePort uint, stdOut, stdErr io.Writer) error {
        log.InitForCmd()
        var forwardPod *corev1.Pod
diff --git a/pkg/util/source/inspector.go b/pkg/util/source/inspector.go
index 5212f6bfe..34f3004ab 100644
--- a/pkg/util/source/inspector.go
+++ b/pkg/util/source/inspector.go
@@ -285,6 +285,8 @@ func (i *baseInspector) discoverCapabilities(source 
v1.SourceSpec, meta *Metadat
 }
 
 // discoverDependencies returns a list of dependencies required by the given 
source code.
+//
+//nolint:gocognit
 func (i *baseInspector) discoverDependencies(source v1.SourceSpec, meta 
*Metadata) error {
        for _, uri := range meta.FromURIs {
                // consumer
diff --git a/pkg/util/source/inspector_xml.go b/pkg/util/source/inspector_xml.go
index ecbd38a2e..80667aba0 100644
--- a/pkg/util/source/inspector_xml.go
+++ b/pkg/util/source/inspector_xml.go
@@ -35,6 +35,8 @@ type XMLInspector struct {
 }
 
 // Extract extracts all metadata from source spec.
+//
+//nolint:cyclop,gocognit,gocyclo
 func (i XMLInspector) Extract(source v1.SourceSpec, meta *Metadata) error {
        content := strings.NewReader(source.Content)
        decoder := xml.NewDecoder(content)
diff --git a/pkg/util/source/inspector_yaml.go 
b/pkg/util/source/inspector_yaml.go
index 3614d7332..2fdbca102 100644
--- a/pkg/util/source/inspector_yaml.go
+++ b/pkg/util/source/inspector_yaml.go
@@ -84,7 +84,7 @@ func (i YAMLInspector) parseDefinition(def map[string]any, 
meta *Metadata) error
        return nil
 }
 
-//nolint:nestif
+//nolint:cyclop,gocognit,gocyclo,nestif
 func (i YAMLInspector) parseStep(key string, content any, meta *Metadata) 
error {
        switch key {
        case "bean":

Reply via email to