feat(ci): bump golang 1.23

Closes #5877
apache · Nov 9, 2024 · 7797169 · 7797169
1 parent 8922909
commit 7797169
Show file tree

Hide file tree

Showing 47 changed files with 255 additions and 294 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -88,7 +88,6 @@ linters:
     - cyclop
     - depguard
     - exhaustive
-    - exhaustivestruct
     - exhaustruct
     - forbidigo
     - funlen

diff --git a/addons/vault/aws/aws_secrets_manager.go b/addons/vault/aws/aws_secrets_manager.go
@@ -127,7 +127,7 @@ func (t *awsSecretsManagerTrait) Apply(environment *trait.Environment) error {
 
 	hits := v1.PlainConfigSecretRegexp.FindAllStringSubmatch(t.AccessKey, -1)
 	if len(hits) >= 1 {
-		var res, _ = v1.DecodeValueSource(t.AccessKey, "aws-access-key", "The access Key provided is not valid")
+		var res, _ = v1.DecodeValueSource(t.AccessKey, "aws-access-key")
 		if secretValue, err := kubernetes.ResolveValueSource(environment.Ctx, environment.Client, environment.Platform.Namespace, &res); err != nil {
 			return err
 		} else if secretValue != "" {
@@ -138,7 +138,7 @@ func (t *awsSecretsManagerTrait) Apply(environment *trait.Environment) error {
 	}
 	hits = v1.PlainConfigSecretRegexp.FindAllStringSubmatch(t.SecretKey, -1)
 	if len(hits) >= 1 {
-		var res, _ = v1.DecodeValueSource(t.SecretKey, "aws-secret-key", "The secret Key provided is not valid")
+		var res, _ = v1.DecodeValueSource(t.SecretKey, "aws-secret-key")
 		if secretValue, err := kubernetes.ResolveValueSource(environment.Ctx, environment.Client, environment.Platform.Namespace, &res); err != nil {
 			return err
 		} else if secretValue != "" {

diff --git a/addons/vault/azure/azure_key_vault.go b/addons/vault/azure/azure_key_vault.go
@@ -140,7 +140,7 @@ func (t *azureKeyVaultTrait) Apply(environment *trait.Environment) error {
 
 	hits := v1.PlainConfigSecretRegexp.FindAllStringSubmatch(t.ClientSecret, -1)
 	if len(hits) >= 1 {
-		var res, _ = v1.DecodeValueSource(t.ClientSecret, "azure-key-vault-client-secret", "The Azure Key Vault Client Secret provided is not valid")
+		var res, _ = v1.DecodeValueSource(t.ClientSecret, "azure-key-vault-client-secret")
 		if secretValue, err := kubernetes.ResolveValueSource(environment.Ctx, environment.Client, environment.Platform.Namespace, &res); err != nil {
 			return err
 		} else if secretValue != "" {
@@ -151,7 +151,7 @@ func (t *azureKeyVaultTrait) Apply(environment *trait.Environment) error {
 	}
 	hits = v1.PlainConfigSecretRegexp.FindAllStringSubmatch(t.BlobAccessKey, -1)
 	if len(hits) >= 1 {
-		var res, _ = v1.DecodeValueSource(t.BlobAccessKey, "azure-storage-blob-access-key", "The Azure Storage Blob Access Key provided is not valid")
+		var res, _ = v1.DecodeValueSource(t.BlobAccessKey, "azure-storage-blob-access-key")
 		if secretValue, err := kubernetes.ResolveValueSource(environment.Ctx, environment.Client, environment.Platform.Namespace, &res); err != nil {
 			return err
 		} else if secretValue != "" {

diff --git a/addons/vault/hashicorp/hashicorp_vault.go b/addons/vault/hashicorp/hashicorp_vault.go
@@ -102,7 +102,7 @@ func (t *hashicorpVaultTrait) Apply(environment *trait.Environment) error {
 
 	hits := v1.PlainConfigSecretRegexp.FindAllStringSubmatch(t.Token, -1)
 	if len(hits) >= 1 {
-		var res, _ = v1.DecodeValueSource(t.Token, "hashicorp-vault-token", "The Hashicorp Vault Token provided is not valid")
+		var res, _ = v1.DecodeValueSource(t.Token, "hashicorp-vault-token")
 
 		secretValue, err := kubernetes.ResolveValueSource(environment.Ctx, environment.Client, environment.Platform.Namespace, &res)
 		if err != nil {

diff --git a/cmd/util/doc-gen/generators/traitdocgen.go b/cmd/util/doc-gen/generators/traitdocgen.go
@@ -330,14 +330,14 @@ func writeFile(file *os.File, content []string) error {
 	if err := file.Truncate(0); err != nil {
 		return err
 	}
-	max := 0
+	mx := 0
 	for i, line := range content {
 		if line != "" {
-			max = i
+			mx = i
 		}
 	}
 	for i, line := range content {
-		if i <= max {
+		if i <= mx {
 			if _, err := file.WriteString(line + "\n"); err != nil {
 				return err
 			}

diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -6608,7 +6608,7 @@ bool
 Can be used to enable/disable exposure via kubernetes Service.
 
 |`port` +
-int
+int32
 |
 
 
@@ -6622,7 +6622,7 @@ string
 To configure a different port name for the port exposed by the container. It defaults to `http` only when the `expose` parameter is true.
 
 |`servicePort` +
-int
+int32
 |
 
 
@@ -7556,7 +7556,7 @@ string
 The password used for authentication, applicable when the `user` option is set.
 
 |`port` +
-int
+int32
 |
 
 

diff --git a/docs/modules/traits/pages/container.adoc b/docs/modules/traits/pages/container.adoc
@@ -56,15 +56,15 @@ The following configuration options are available:
 | Can be used to enable/disable exposure via kubernetes Service.
 
 | container.port
-| int
+| int32
 | To configure a different port exposed by the container (default `8080`).
 
 | container.port-name
 | string
 | To configure a different port name for the port exposed by the container. It defaults to `http` only when the `expose` parameter is true.
 
 | container.service-port
-| int
+| int32
 | To configure under which service port the container port is to be exposed (default `80`).
 
 | container.service-port-name

diff --git a/docs/modules/traits/pages/jolokia.adoc b/docs/modules/traits/pages/jolokia.adoc
@@ -63,7 +63,7 @@ the servers binds to every network interface (default `"*"`).
 | The password used for authentication, applicable when the `user` option is set.
 
 | jolokia.port
-| int
+| int32
 | The Jolokia endpoint port (default `8778`).
 
 | jolokia.protocol

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/apache/camel-k/v2
 
-go 1.22
+go 1.23
 
 require (
 	github.com/Masterminds/semver v1.5.0

diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml
@@ -3930,6 +3930,7 @@ spec:
                       port:
                         description: To configure a different port exposed by the
                           container (default `8080`).
+                        format: int32
                         type: integer
                       portName:
                         description: To configure a different port name for the port
@@ -3964,6 +3965,7 @@ spec:
                       servicePort:
                         description: To configure under which service port the container
                           port is to be exposed (default `80`).
+                        format: int32
                         type: integer
                       servicePortName:
                         description: To configure under which service port name the
@@ -4457,6 +4459,7 @@ spec:
                         type: string
                       port:
                         description: The Jolokia endpoint port (default `8778`).
+                        format: int32
                         type: integer
                       protocol:
                         description: The protocol to use, either `http` or `https`
@@ -6081,6 +6084,7 @@ spec:
                       port:
                         description: To configure a different port exposed by the
                           container (default `8080`).
+                        format: int32
                         type: integer
                       portName:
                         description: To configure a different port name for the port
@@ -6115,6 +6119,7 @@ spec:
                       servicePort:
                         description: To configure under which service port the container
                           port is to be exposed (default `80`).
+                        format: int32
                         type: integer
                       servicePortName:
                         description: To configure under which service port name the
@@ -6608,6 +6613,7 @@ spec:
                         type: string
                       port:
                         description: The Jolokia endpoint port (default `8778`).
+                        format: int32
                         type: integer
                       protocol:
                         description: The protocol to use, either `http` or `https`
@@ -8135,6 +8141,7 @@ spec:
                       port:
                         description: To configure a different port exposed by the
                           container (default `8080`).
+                        format: int32
                         type: integer
                       portName:
                         description: To configure a different port name for the port
@@ -8169,6 +8176,7 @@ spec:
                       servicePort:
                         description: To configure under which service port the container
                           port is to be exposed (default `80`).
+                        format: int32
                         type: integer
                       servicePortName:
                         description: To configure under which service port name the
@@ -8662,6 +8670,7 @@ spec:
                         type: string
                       port:
                         description: The Jolokia endpoint port (default `8778`).
+                        format: int32
                         type: integer
                       protocol:
                         description: The protocol to use, either `http` or `https`
@@ -10165,6 +10174,7 @@ spec:
                       port:
                         description: To configure a different port exposed by the
                           container (default `8080`).
+                        format: int32
                         type: integer
                       portName:
                         description: To configure a different port name for the port
@@ -10199,6 +10209,7 @@ spec:
                       servicePort:
                         description: To configure under which service port the container
                           port is to be exposed (default `80`).
+                        format: int32
                         type: integer
                       servicePortName:
                         description: To configure under which service port name the
@@ -10692,6 +10703,7 @@ spec:
                         type: string
                       port:
                         description: The Jolokia endpoint port (default `8778`).
+                        format: int32
                         type: integer
                       protocol:
                         description: The protocol to use, either `http` or `https`
@@ -18236,6 +18248,7 @@ spec:
                       port:
                         description: To configure a different port exposed by the
                           container (default `8080`).
+                        format: int32
                         type: integer
                       portName:
                         description: To configure a different port name for the port
@@ -18270,6 +18283,7 @@ spec:
                       servicePort:
                         description: To configure under which service port the container
                           port is to be exposed (default `80`).
+                        format: int32
                         type: integer
                       servicePortName:
                         description: To configure under which service port name the
@@ -18763,6 +18777,7 @@ spec:
                         type: string
                       port:
                         description: The Jolokia endpoint port (default `8778`).
+                        format: int32
                         type: integer
                       protocol:
                         description: The protocol to use, either `http` or `https`
@@ -20228,6 +20243,7 @@ spec:
                       port:
                         description: To configure a different port exposed by the
                           container (default `8080`).
+                        format: int32
                         type: integer
                       portName:
                         description: To configure a different port name for the port
@@ -20262,6 +20278,7 @@ spec:
                       servicePort:
                         description: To configure under which service port the container
                           port is to be exposed (default `80`).
+                        format: int32
                         type: integer
                       servicePortName:
                         description: To configure under which service port name the
@@ -20755,6 +20772,7 @@ spec:
                         type: string
                       port:
                         description: The Jolokia endpoint port (default `8778`).
+                        format: int32
                         type: integer
                       protocol:
                         description: The protocol to use, either `http` or `https`
@@ -28373,6 +28391,7 @@ spec:
                           port:
                             description: To configure a different port exposed by
                               the container (default `8080`).
+                            format: int32
                             type: integer
                           portName:
                             description: To configure a different port name for the
@@ -28407,6 +28426,7 @@ spec:
                           servicePort:
                             description: To configure under which service port the
                               container port is to be exposed (default `80`).
+                            format: int32
                             type: integer
                           servicePortName:
                             description: To configure under which service port name
@@ -28901,6 +28921,7 @@ spec:
                             type: string
                           port:
                             description: The Jolokia endpoint port (default `8778`).
+                            format: int32
                             type: integer
                           protocol:
                             description: The protocol to use, either `http` or `https`
@@ -39310,6 +39331,7 @@ spec:
                           port:
                             description: To configure a different port exposed by
                               the container (default `8080`).
+                            format: int32
                             type: integer
                           portName:
                             description: To configure a different port name for the
@@ -39344,6 +39366,7 @@ spec:
                           servicePort:
                             description: To configure under which service port the
                               container port is to be exposed (default `80`).
+                            format: int32
                             type: integer
                           servicePortName:
                             description: To configure under which service port name
@@ -39838,6 +39861,7 @@ spec:
                             type: string
                           port:
                             description: The Jolokia endpoint port (default `8778`).
+                            format: int32
                             type: integer
                           protocol:
                             description: The protocol to use, either `http` or `https`

diff --git a/pkg/apis/camel/v1/common_types_support.go b/pkg/apis/camel/v1/common_types_support.go
@@ -224,7 +224,7 @@ func (bc *BuildConfiguration) IsEmpty() bool {
 }
 
 // DecodeValueSource returns a ValueSource object from an input that respects the format configmap|secret:resource-name[/path].
-func DecodeValueSource(input string, defaultKey string, errorMessage string) (ValueSource, error) {
+func DecodeValueSource(input string, defaultKey string) (ValueSource, error) {
 	sub := make([]string, 0)
 	hits := PlainConfigSecretRegexp.FindAllStringSubmatch(input, -1)
 
@@ -262,7 +262,7 @@ func DecodeValueSource(input string, defaultKey string, errorMessage string) (Va
 		}
 	}
 
-	return ValueSource{}, fmt.Errorf(errorMessage)
+	return ValueSource{}, fmt.Errorf("could not decode %s", input)
 }
 
 // IsGeneratedFromKamelet determines is a source spec is derived from a Kamelet.