You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/04/03 15:56:11 UTC
[camel-k] 02/02: Fix lint findings
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2c490209b975b2636c8f81814f74a589926c7d9b
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri Apr 3 15:17:45 2020 +0200
Fix lint findings
---
pkg/apis/camel/v1/common_types.go | 4 ++--
pkg/trait/container.go | 2 +-
pkg/trait/knative.go | 4 ++--
pkg/trait/knative_test.go | 10 ++++++----
pkg/util/digest/digest.go | 2 ++
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go
index 7d45eea..6aecd5c 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -113,8 +113,8 @@ const (
CapabilityHealth = "health"
// CapabilityCron --
CapabilityCron = "cron"
- // CapabilityPlatformHttp --
- CapabilityPlatformHttp = "platform-http"
+ // CapabilityPlatformHTTP --
+ CapabilityPlatformHTTP = "platform-http"
)
// ResourceCondition is a common type for all conditions
diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index b5c4ec7..7f45e51 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -419,7 +419,7 @@ func (t *containerTrait) configureCapabilities(e *Environment) error {
requiresHTTP = true
}
- if util.StringSliceExists(e.Integration.Status.Capabilities, v1.CapabilityPlatformHttp) {
+ if util.StringSliceExists(e.Integration.Status.Capabilities, v1.CapabilityPlatformHTTP) {
requiresHTTP = true
}
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index 20747bb..ef7fdb3 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -174,10 +174,10 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) {
func (t *knativeTrait) Apply(e *Environment) error {
if len(t.ChannelSources) > 0 || len(t.EndpointSources) > 0 || len(t.EventSources) > 0 {
- util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityPlatformHttp)
+ util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityPlatformHTTP)
}
if len(t.ChannelSinks) > 0 || len(t.EndpointSinks) > 0 || len(t.EventSinks) > 0 {
- util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityPlatformHttp)
+ util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityPlatformHTTP)
}
if e.IntegrationInPhase(v1.IntegrationPhaseDeploying, v1.IntegrationPhaseRunning) {
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index ad6b766..941e557 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -264,7 +264,8 @@ func TestKnativePlatformHttpConfig(t *testing.T) {
},
}
- for _, source := range sources {
+ for _, ref := range sources {
+ source := ref
t.Run(source.Name, func(t *testing.T) {
environment := NewFakeEnvironment(t, source)
@@ -279,7 +280,7 @@ func TestKnativePlatformHttpConfig(t *testing.T) {
err = tc.apply(&environment)
assert.Nil(t, err)
- assert.Contains(t, environment.Integration.Status.Capabilities, v1.CapabilityPlatformHttp)
+ assert.Contains(t, environment.Integration.Status.Capabilities, v1.CapabilityPlatformHTTP)
assert.Equal(t, "true", environment.ApplicationProperties["customizer.platform-http.enabled"])
assert.Equal(t, "8080", environment.ApplicationProperties["customizer.platform-http.bind-port"])
})
@@ -311,7 +312,8 @@ func TestKnativePlatformHttpDepdencies(t *testing.T) {
},
}
- for _, source := range sources {
+ for _, ref := range sources {
+ source := ref
t.Run(source.Name, func(t *testing.T) {
environment := NewFakeEnvironment(t, source)
environment.Integration.Status.Phase = v1.IntegrationPhaseInitialization
@@ -327,7 +329,7 @@ func TestKnativePlatformHttpDepdencies(t *testing.T) {
err = tc.apply(&environment)
assert.Nil(t, err)
- assert.Contains(t, environment.Integration.Status.Capabilities, v1.CapabilityPlatformHttp)
+ assert.Contains(t, environment.Integration.Status.Capabilities, v1.CapabilityPlatformHTTP)
assert.Contains(t, environment.Integration.Status.Dependencies, "mvn:org.apache.camel.k/camel-k-runtime-http")
})
}
diff --git a/pkg/util/digest/digest.go b/pkg/util/digest/digest.go
index 4c0b7cf..c79f045 100644
--- a/pkg/util/digest/digest.go
+++ b/pkg/util/digest/digest.go
@@ -18,6 +18,7 @@ limitations under the License.
package digest
import (
+ // nolint: gosec
"crypto/sha1"
"crypto/sha256"
"encoding/base64"
@@ -182,6 +183,7 @@ func ComputeSHA1(elem ...string) (string, error) {
}
defer f.Close()
+ // nolint: gosec
h := sha1.New()
if _, err := io.Copy(h, f); err != nil {
return "", err