[camel-k] 03/08: Fix #952, #888: fix findings

[nf...@apache.org]

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

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

commit b5e6e37e3ddcb94f0932aa0349edafe7e777e954
Author: nferraro <ni...@gmail.com>
AuthorDate: Thu Sep 26 12:41:25 2019 +0200

    Fix #952, #888: fix findings
---
 pkg/trait/container.go            | 2 +-
 pkg/trait/knative_service_test.go | 2 +-
 pkg/trait/knative_test.go         | 4 ++--
 pkg/trait/owner.go                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index df7de6e..7ac4435 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -23,11 +23,11 @@ import (
 
 	"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
 	"github.com/apache/camel-k/pkg/util/envvar"
-	serving "knative.dev/serving/pkg/apis/serving/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	serving "knative.dev/serving/pkg/apis/serving/v1beta1"
 )
 
 const (
diff --git a/pkg/trait/knative_service_test.go b/pkg/trait/knative_service_test.go
index 7b39ed0..04a21c4 100644
--- a/pkg/trait/knative_service_test.go
+++ b/pkg/trait/knative_service_test.go
@@ -28,9 +28,9 @@ import (
 	"github.com/apache/camel-k/pkg/util/kubernetes"
 	"github.com/apache/camel-k/pkg/util/test"
 
-	serving "knative.dev/serving/pkg/apis/serving/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	serving "knative.dev/serving/pkg/apis/serving/v1beta1"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index a3cbfac..35b0a66 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -248,10 +248,10 @@ func TestDecodeKindAPIGroupVersion(t *testing.T) {
 		Kind:    "Channel",
 	}, kgv)
 
-	kgv, err = decodeKindAPIGroupVersion("messaging.knative.dev/v1alpha1/Chann/el/")
+	_, err = decodeKindAPIGroupVersion("messaging.knative.dev/v1alpha1/Chann/el/")
 	assert.NotNil(t, err)
 
-	kgv, err = decodeKindAPIGroupVersion("messaging.knative.dev/v1alpha1")
+	_, err = decodeKindAPIGroupVersion("messaging.knative.dev/v1alpha1")
 	assert.NotNil(t, err)
 }
 
diff --git a/pkg/trait/owner.go b/pkg/trait/owner.go
index 286b085..a056fcb 100644
--- a/pkg/trait/owner.go
+++ b/pkg/trait/owner.go
@@ -25,9 +25,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	serving "knative.dev/serving/pkg/apis/serving/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	serving "knative.dev/serving/pkg/apis/serving/v1beta1"
 )
 
 // ownerTrait ensures that all created resources belong to the integration being created