This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit df0991ca9f323cc7b8f3fb08f8f545946eb55548
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Thu Jan 16 10:33:20 2020 +0100
chore(trait): Remove environment classpath member
---
pkg/trait/builder_test.go | 2 --
pkg/trait/classpath.go | 16 +++++------
pkg/trait/classpath_test.go | 60 ++++-----------------------------------
pkg/trait/container_test.go | 3 --
pkg/trait/environment_test.go | 4 ---
pkg/trait/knative_service_test.go | 3 --
pkg/trait/knative_test.go | 3 --
pkg/trait/route_test.go | 2 --
pkg/trait/service_test.go | 4 ---
pkg/trait/trait_test.go | 2 --
pkg/trait/trait_types.go | 14 ---------
11 files changed, 13 insertions(+), 100 deletions(-)
diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go
index 591c8a0..22e7849 100644
--- a/pkg/trait/builder_test.go
+++ b/pkg/trait/builder_test.go
@@ -21,7 +21,6 @@ import (
"context"
"testing"
- "github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
@@ -159,7 +158,6 @@ func createBuilderTestEnv(cluster
v1.IntegrationPlatformCluster, strategy v1.Int
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
res.Platform.ResyncStatusFullConfig()
diff --git a/pkg/trait/classpath.go b/pkg/trait/classpath.go
index aedbf91..6cf1c62 100644
--- a/pkg/trait/classpath.go
+++ b/pkg/trait/classpath.go
@@ -75,19 +75,17 @@ func (t *classpathTrait) Apply(e *Environment) error {
return fmt.Errorf("unable to find integration kit %s",
e.Integration.Status.Kit)
}
- if e.Classpath == nil {
- e.Classpath = strset.New()
- }
+ classpath := strset.New()
- e.Classpath.Add("/etc/camel/resources")
- e.Classpath.Add("./resources")
+ classpath.Add("/etc/camel/resources")
+ classpath.Add("./resources")
quarkus := e.Catalog.GetTrait("quarkus").(*quarkusTrait)
if quarkus.isEnabled() {
quarkus.addClasspath(e)
} else {
for _, artifact := range kit.Status.Artifacts {
- e.Classpath.Add(artifact.Target)
+ classpath.Add(artifact.Target)
}
}
@@ -97,7 +95,7 @@ func (t *classpathTrait) Apply(e *Environment) error {
// the classpath so we assume the all jars in
/deployments/dependencies/ have
// to be taken into account
//
- e.Classpath.Add("/deployments/dependencies/*")
+ classpath.Add("/deployments/dependencies/*")
}
containerName := defaultContainerName
@@ -109,10 +107,10 @@ func (t *classpathTrait) Apply(e *Environment) error {
container := e.Resources.GetContainerByName(containerName)
if container != nil {
for _, m := range container.VolumeMounts {
- e.Classpath.Add(m.MountPath)
+ classpath.Add(m.MountPath)
}
- items := e.Classpath.List()
+ items := classpath.List()
// keep classpath sorted
sort.Strings(items)
diff --git a/pkg/trait/classpath_test.go b/pkg/trait/classpath_test.go
index 3c4c221..1cb50ad 100644
--- a/pkg/trait/classpath_test.go
+++ b/pkg/trait/classpath_test.go
@@ -71,41 +71,6 @@ func TestConfigureClasspathDisabledTraitDoesNotSucceed(t
*testing.T) {
assert.False(t, configured)
}
-func TestApplyClasspathTraitPlaftormIntegrationKitLazyInstantiation(t
*testing.T) {
- trait, environment := createNominalClasspathTest()
- environment.IntegrationKit = nil
- environment.Integration.Namespace = "kit-namespace"
- environment.Integration.Status.Kit = "kit-name"
-
- err := trait.Apply(environment)
-
- assert.Nil(t, err)
- assert.Equal(t, strset.New("/etc/camel/resources", "./resources"),
environment.Classpath)
-}
-
-func TestApplyClasspathTraitExternalIntegrationKitLazyInstantiation(t
*testing.T) {
- trait, environment :=
createClasspathTestWithKitType(v1.IntegrationKitTypeExternal)
- environment.IntegrationKit = nil
- environment.Integration.Namespace = "kit-namespace"
- environment.Integration.Status.Kit = "kit-name"
-
- err := trait.Apply(environment)
-
- assert.Nil(t, err)
- assert.Equal(t, strset.New("/etc/camel/resources", "./resources",
"/deployments/dependencies/*"), environment.Classpath)
-}
-
-func TestApplyClasspathTraitWithIntegrationKitStatusArtifact(t *testing.T) {
- trait, environment := createNominalClasspathTest()
- environment.IntegrationKit.Status.Artifacts = []v1.Artifact{{ID: "",
Location: "", Target: "/dep/target"}}
-
- err := trait.Apply(environment)
-
- assert.Nil(t, err)
- assert.NotNil(t, environment.Classpath)
- assert.Equal(t, strset.New("/etc/camel/resources", "./resources",
"/dep/target"), environment.Classpath)
-}
-
func TestApplyClasspathTraitWithDeploymentResource(t *testing.T) {
trait, environment := createNominalClasspathTest()
@@ -132,12 +97,11 @@ func TestApplyClasspathTraitWithDeploymentResource(t
*testing.T) {
err := trait.Apply(environment)
- cp := environment.Classpath.List()
+ assert.Nil(t, err)
+
+ cp := strset.New("/etc/camel/resources", "./resources",
"/mount/path").List()
sort.Strings(cp)
- assert.Nil(t, err)
- assert.NotNil(t, environment.Classpath)
- assert.Equal(t, strset.New("/etc/camel/resources", "./resources",
"/mount/path"), environment.Classpath)
assert.Len(t, d.Spec.Template.Spec.Containers[0].Env, 1)
assert.Equal(t, "JAVA_CLASSPATH",
d.Spec.Template.Spec.Containers[0].Env[0].Name)
assert.Equal(t, strings.Join(cp, ":"),
d.Spec.Template.Spec.Containers[0].Env[0].Value)
@@ -163,33 +127,21 @@ func TestApplyClasspathTraitWithKNativeResource(t
*testing.T) {
err := trait.Apply(environment)
- cp := environment.Classpath.List()
+ assert.Nil(t, err)
+
+ cp := strset.New("/etc/camel/resources", "./resources",
"/mount/path").List()
sort.Strings(cp)
- assert.Nil(t, err)
- assert.NotNil(t, environment.Classpath)
- assert.ElementsMatch(t, []string{"/etc/camel/resources", "./resources",
"/mount/path"}, cp)
assert.Len(t, s.Spec.ConfigurationSpec.Template.Spec.Containers[0].Env,
1)
assert.Equal(t, "JAVA_CLASSPATH",
s.Spec.ConfigurationSpec.Template.Spec.Containers[0].Env[0].Name)
assert.Equal(t, strings.Join(cp, ":"),
s.Spec.ConfigurationSpec.Template.Spec.Containers[0].Env[0].Value)
}
-func TestApplyClasspathTraitWithNominalIntegrationKit(t *testing.T) {
- trait, environment := createNominalClasspathTest()
-
- err := trait.Apply(environment)
-
- assert.Nil(t, err)
- assert.NotNil(t, environment.Classpath)
- assert.Equal(t, strset.New("/etc/camel/resources", "./resources"),
environment.Classpath)
-}
-
func createNominalClasspathTest() (*classpathTrait, *Environment) {
return createClasspathTestWithKitType(v1.IntegrationKitTypePlatform)
}
func createClasspathTestWithKitType(kitType string) (*classpathTrait,
*Environment) {
-
client, _ := test.NewFakeClient(
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
diff --git a/pkg/trait/container_test.go b/pkg/trait/container_test.go
index 26c20c5..8510fa6 100644
--- a/pkg/trait/container_test.go
+++ b/pkg/trait/container_test.go
@@ -21,7 +21,6 @@ import (
"context"
"testing"
- "github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
@@ -70,7 +69,6 @@ func TestContainerWithDefaults(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
@@ -133,7 +131,6 @@ func TestContainerWithCustomName(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
diff --git a/pkg/trait/environment_test.go b/pkg/trait/environment_test.go
index 2e19937..fbcbfc9 100644
--- a/pkg/trait/environment_test.go
+++ b/pkg/trait/environment_test.go
@@ -21,7 +21,6 @@ import (
"context"
"testing"
- "github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
@@ -64,7 +63,6 @@ func TestDefaultEnvironment(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
env.Platform.ResyncStatusFullConfig()
@@ -133,7 +131,6 @@ func TestEnabledContainerMetaDataEnvVars(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
env.Platform.ResyncStatusFullConfig()
@@ -202,7 +199,6 @@ func TestDisabledContainerMetaDataEnvVars(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
env.Platform.ResyncStatusFullConfig()
diff --git a/pkg/trait/knative_service_test.go
b/pkg/trait/knative_service_test.go
index 6a312ce..cd16d2f 100644
--- a/pkg/trait/knative_service_test.go
+++ b/pkg/trait/knative_service_test.go
@@ -21,7 +21,6 @@ import (
"context"
"testing"
- "github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
@@ -110,7 +109,6 @@ func TestKnativeService(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
@@ -237,7 +235,6 @@ func TestKnativeServiceWithCustomContainerName(t
*testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index c60271f..fc119c5 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -21,7 +21,6 @@ import (
"context"
"testing"
- "github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
@@ -96,7 +95,6 @@ func TestKnativeEnvConfigurationFromTrait(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: k8sutils.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
@@ -206,7 +204,6 @@ func TestKnativeEnvConfigurationFromSource(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: k8sutils.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
diff --git a/pkg/trait/route_test.go b/pkg/trait/route_test.go
index 87c0068..bba96d2 100644
--- a/pkg/trait/route_test.go
+++ b/pkg/trait/route_test.go
@@ -22,7 +22,6 @@ import (
"testing"
"github.com/rs/xid"
- "github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
routev1 "github.com/openshift/api/route/v1"
@@ -68,7 +67,6 @@ func createTestRouteEnvironment(t *testing.T, name string)
*Environment {
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
- Classpath: strset.New(),
Resources: kubernetes.NewCollection(
&corev1.Service{
TypeMeta: metav1.TypeMeta{
diff --git a/pkg/trait/service_test.go b/pkg/trait/service_test.go
index f5e6d9f..49a525e 100644
--- a/pkg/trait/service_test.go
+++ b/pkg/trait/service_test.go
@@ -21,7 +21,6 @@ import (
"context"
"testing"
- "github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
@@ -94,7 +93,6 @@ func TestServiceWithDefaults(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
@@ -193,7 +191,6 @@ func TestService(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
@@ -277,7 +274,6 @@ func TestServiceWithCustomContainerName(t *testing.T) {
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
environment.Platform.ResyncStatusFullConfig()
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index 0738777..bab4131 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -21,7 +21,6 @@ import (
"context"
"testing"
- "github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/assert"
routev1 "github.com/openshift/api/route/v1"
@@ -470,7 +469,6 @@ func createTestEnv(t *testing.T, cluster
v1.IntegrationPlatformCluster, script s
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
- Classpath: strset.New(),
}
res.Platform.ResyncStatusFullConfig()
return res
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
index 0305b13..de8a6c9 100644
--- a/pkg/trait/trait_types.go
+++ b/pkg/trait/trait_types.go
@@ -25,8 +25,6 @@ import (
"strconv"
"strings"
- "github.com/scylladb/go-set/strset"
-
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
controller "sigs.k8s.io/controller-runtime/pkg/client"
@@ -155,7 +153,6 @@ type Environment struct {
ConfiguredTraits []Trait
ExecutedTraits []Trait
EnvVars []corev1.EnvVar
- Classpath *strset.Set
}
// ControllerStrategy is used to determine the kind of controller that needs
to be created for the integration
@@ -181,17 +178,6 @@ func (e *Environment) GetTrait(id ID) Trait {
return nil
}
-// GetConfiguredTrait --
-func (e *Environment) GetConfiguredTrait(id ID) Trait {
- for _, t := range e.ConfiguredTraits {
- if t.ID() == id {
- return t
- }
- }
-
- return nil
-}
-
// IntegrationInPhase --
func (e *Environment) IntegrationInPhase(phases ...v1.IntegrationPhase) bool {
if e.Integration == nil {
