This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3c59920d06d40d73d10e41d95d137b114e1b47ed
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Thu Sep 8 10:04:07 2022 +0200
chore(test): Update unit test environments
---
pkg/trait/camel_test.go | 23 ++++++++++++++++++-----
pkg/trait/container_probes_test.go | 15 ++++++++++++---
pkg/trait/container_test.go | 27 ++++++++++++++++++++++++++-
pkg/trait/cron_test.go | 30 ++++++++++++++++++++++++++++--
pkg/trait/environment_test.go | 6 ++++++
pkg/trait/istio_test.go | 6 ++++++
pkg/trait/knative_service_test.go | 18 ++++++++++++++++++
pkg/trait/knative_test.go | 4 ++++
pkg/trait/logging_test.go | 8 ++++++++
pkg/trait/mount_test.go | 4 ++++
pkg/trait/route_test.go | 4 ++++
pkg/trait/service_test.go | 16 ++++++++++++++++
pkg/trait/trait_test.go | 6 ++++++
13 files changed, 156 insertions(+), 11 deletions(-)
diff --git a/pkg/trait/camel_test.go b/pkg/trait/camel_test.go
index 20e555975..80fd1d43b 100644
--- a/pkg/trait/camel_test.go
+++ b/pkg/trait/camel_test.go
@@ -53,7 +53,11 @@ func TestConfigureDisabledCamelTraitFails(t *testing.T) {
func TestApplyCamelTraitSucceeds(t *testing.T) {
trait, environment := createNominalCamelTest()
- err := trait.Apply(environment)
+ configured, err := trait.Configure(environment)
+ assert.Nil(t, err)
+ assert.True(t, configured)
+
+ err = trait.Apply(environment)
assert.Nil(t, err)
assert.Equal(t, "0.0.1", environment.RuntimeVersion)
assert.Equal(t, "0.0.1", environment.Integration.Status.RuntimeVersion)
@@ -66,7 +70,11 @@ func
TestApplyCamelTraitWithoutEnvironmentCatalogAndUnmatchableVersionFails(t *t
environment.Integration.Status.RuntimeVersion = "Unmatchable version"
environment.Integration.Status.RuntimeProvider =
v1.RuntimeProviderQuarkus
- err := trait.Apply(environment)
+ configured, err := trait.Configure(environment)
+ assert.Nil(t, err)
+ assert.True(t, configured)
+
+ err = trait.Apply(environment)
assert.NotNil(t, err)
assert.Equal(t, "unable to find catalog matching version requirement:
runtime=Unmatchable version, provider=quarkus", err.Error())
}
@@ -119,9 +127,14 @@ func createNominalCamelTest() (*camelTrait, *Environment) {
}
func TestApplyCamelTraitWithProperties(t *testing.T) {
- camelTrait, environment := createNominalCamelTest()
- camelTrait.Properties = []string{"a=b", "c=d"}
- err := camelTrait.Apply(environment)
+ trait, environment := createNominalCamelTest()
+ trait.Properties = []string{"a=b", "c=d"}
+
+ configured, err := trait.Configure(environment)
+ assert.Nil(t, err)
+ assert.True(t, configured)
+
+ err = trait.Apply(environment)
assert.Nil(t, err)
userPropertiesCm := environment.Resources.GetConfigMap(func(cm
*corev1.ConfigMap) bool {
diff --git a/pkg/trait/container_probes_test.go
b/pkg/trait/container_probes_test.go
index 2642f032d..55c1c6287 100644
--- a/pkg/trait/container_probes_test.go
+++ b/pkg/trait/container_probes_test.go
@@ -41,9 +41,18 @@ func newTestProbesEnv(t *testing.T, integration
*v1.Integration) Environment {
traitCatalog := NewCatalog(nil)
return Environment{
- Catalog: traitCatalog,
- CamelCatalog: catalog,
- Platform: &v1.IntegrationPlatform{},
+ Catalog: traitCatalog,
+ CamelCatalog: catalog,
+ Platform: &v1.IntegrationPlatform{
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ IntegrationPlatformSpec:
v1.IntegrationPlatformSpec{
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion:
catalog.Runtime.Version,
+ },
+ },
+ },
+ },
Integration: integration,
Resources: kubernetes.NewCollection(),
ApplicationProperties: make(map[string]string),
diff --git a/pkg/trait/container_test.go b/pkg/trait/container_test.go
index 54d2157b5..4109653de 100644
--- a/pkg/trait/container_test.go
+++ b/pkg/trait/container_test.go
@@ -69,8 +69,12 @@ func TestContainerWithDefaults(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -129,8 +133,12 @@ func TestContainerWithCustomName(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -190,8 +198,12 @@ func TestContainerWithCustomImage(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -265,8 +277,12 @@ func TestContainerWithCustomImageAndIntegrationKit(t
*testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -301,7 +317,16 @@ func TestContainerWithImagePullPolicy(t *testing.T) {
},
},
},
- Platform: &v1.IntegrationPlatform{},
+ Platform: &v1.IntegrationPlatform{
+ Spec: v1.IntegrationPlatformSpec{
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion: catalog.Runtime.Version,
+ },
+ },
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
+ },
Resources: kubernetes.NewCollection(),
}
environment.Integration.Status.Phase = v1.IntegrationPhaseDeploying
diff --git a/pkg/trait/cron_test.go b/pkg/trait/cron_test.go
index 9e30936d1..46dbc8980 100644
--- a/pkg/trait/cron_test.go
+++ b/pkg/trait/cron_test.go
@@ -264,9 +264,13 @@ func TestCronDeps(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
Profile: v1.TraitProfileKnative,
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -338,9 +342,13 @@ func TestCronDepsFallback(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
Profile: v1.TraitProfileKnative,
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -407,7 +415,16 @@ func TestCronWithActiveDeadline(t *testing.T) {
Phase: v1.IntegrationKitPhaseReady,
},
},
- Platform: &v1.IntegrationPlatform{},
+ Platform: &v1.IntegrationPlatform{
+ Spec: v1.IntegrationPlatformSpec{
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion: catalog.Runtime.Version,
+ },
+ },
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
+ },
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
@@ -480,7 +497,16 @@ func TestCronWithBackoffLimit(t *testing.T) {
Phase: v1.IntegrationKitPhaseReady,
},
},
- Platform: &v1.IntegrationPlatform{},
+ Platform: &v1.IntegrationPlatform{
+ Spec: v1.IntegrationPlatformSpec{
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion: catalog.Runtime.Version,
+ },
+ },
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
+ },
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
Resources: kubernetes.NewCollection(),
diff --git a/pkg/trait/environment_test.go b/pkg/trait/environment_test.go
index 2072e8ede..393207bb9 100644
--- a/pkg/trait/environment_test.go
+++ b/pkg/trait/environment_test.go
@@ -217,6 +217,12 @@ func mockEnvironment(catalog *camel.RuntimeCatalog)
Environment {
},
Spec: v1.IntegrationPlatformSpec{
Cluster: v1.IntegrationPlatformClusterOpenShift,
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion: catalog.Runtime.Version,
+ },
+ },
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
},
},
EnvVars: make([]corev1.EnvVar, 0),
diff --git a/pkg/trait/istio_test.go b/pkg/trait/istio_test.go
index 75e537c9c..097a8a4eb 100644
--- a/pkg/trait/istio_test.go
+++ b/pkg/trait/istio_test.go
@@ -59,6 +59,12 @@ func NewIstioTestEnv(t *testing.T, d *appsv1.Deployment, s
*serving.Service, ena
Spec: v1.IntegrationPlatformSpec{
Cluster: v1.IntegrationPlatformClusterOpenShift,
Profile: v1.TraitProfileKnative,
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion: catalog.Runtime.Version,
+ },
+ },
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
},
},
EnvVars: make([]corev1.EnvVar, 0),
diff --git a/pkg/trait/knative_service_test.go
b/pkg/trait/knative_service_test.go
index 1cab8fdff..15f69a1aa 100644
--- a/pkg/trait/knative_service_test.go
+++ b/pkg/trait/knative_service_test.go
@@ -109,8 +109,12 @@ func TestKnativeService(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -232,8 +236,12 @@ func TestKnativeServiceWithCustomContainerName(t
*testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -310,8 +318,12 @@ func TestKnativeServiceWithResr(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -408,6 +420,12 @@ func createKnativeServiceTestEnvironment(t *testing.T,
trait *traitv1.KnativeSer
Platform: &v1.IntegrationPlatform{
Spec: v1.IntegrationPlatformSpec{
Cluster:
v1.IntegrationPlatformClusterKubernetes,
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion: catalog.Runtime.Version,
+ },
+ },
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
},
},
EnvVars: make([]corev1.EnvVar, 0),
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index de4c6d42d..63f94af82 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -399,9 +399,13 @@ func NewFakeEnvironment(t *testing.T, source
v1.SourceSpec) Environment {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
Profile: v1.TraitProfileKnative,
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
diff --git a/pkg/trait/logging_test.go b/pkg/trait/logging_test.go
index e59563877..e09bbcfa8 100644
--- a/pkg/trait/logging_test.go
+++ b/pkg/trait/logging_test.go
@@ -78,6 +78,14 @@ func createLoggingTestEnv(t *testing.T, color bool, json
bool, jsonPrettyPrint b
Spec: v1.IntegrationPlatformSpec{
Cluster: v1.IntegrationPlatformClusterOpenShift,
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ IntegrationPlatformSpec:
v1.IntegrationPlatformSpec{
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion:
c.Runtime.Version,
+ },
+ },
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
diff --git a/pkg/trait/mount_test.go b/pkg/trait/mount_test.go
index e46e70cb7..5daa8db32 100644
--- a/pkg/trait/mount_test.go
+++ b/pkg/trait/mount_test.go
@@ -174,8 +174,12 @@ func getNominalEnv(t *testing.T, traitCatalog *Catalog)
*Environment {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
diff --git a/pkg/trait/route_test.go b/pkg/trait/route_test.go
index 9ddf24e5f..fb86a2608 100644
--- a/pkg/trait/route_test.go
+++ b/pkg/trait/route_test.go
@@ -162,8 +162,12 @@ func createTestRouteEnvironment(t *testing.T, name string)
*Environment {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
diff --git a/pkg/trait/service_test.go b/pkg/trait/service_test.go
index 944c7cea2..8b1cdfef0 100644
--- a/pkg/trait/service_test.go
+++ b/pkg/trait/service_test.go
@@ -92,8 +92,12 @@ func TestServiceWithDefaults(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -195,8 +199,12 @@ func TestService(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -276,8 +284,12 @@ func TestServiceWithCustomContainerName(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
@@ -360,8 +372,12 @@ func TestServiceWithNodePort(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+ RuntimeVersion:
catalog.Runtime.Version,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars: make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index 2b9f23073..aed180ec1 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -565,6 +565,12 @@ func createTestEnv(t *testing.T, cluster
v1.IntegrationPlatformCluster, script s
Platform: &v1.IntegrationPlatform{
Spec: v1.IntegrationPlatformSpec{
Cluster: cluster,
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion: catalog.Runtime.Version,
+ },
+ },
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
},
},
EnvVars: make([]corev1.EnvVar, 0),
