Fix apache#952, apache#888: fix findings

nicolaferraro · Sep 26, 2019 · 2526409 · 2526409
1 parent e3a7463
commit 2526409
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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