fix(traits): logging for synthetic kits

Ref #5519
apache · May 20, 2024 · 33d8524 · 33d8524
1 parent c5f07cd
commit 33d8524
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
@@ -154,7 +154,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool, *TraitCondition, error)
 	return true, nil, nil
 }
 
-// This is true only when the user set the enabled flag on and the auto flag off
+// This is true only when the user set the enabled flag on and the auto flag off.
 func (t *knativeTrait) isForcefullyEnabled() bool {
 	return pointer.BoolDeref(t.Enabled, false) && !pointer.BoolDeref(t.Auto, true)
 }

diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
@@ -192,7 +192,7 @@ func (t *knativeServiceTrait) SelectControllerStrategy(e *Environment) (*Control
 	return nil, nil
 }
 
-// This is true only when the user set the enabled flag on and the auto flag off
+// This is true only when the user set the enabled flag on and the auto flag off.
 func (t *knativeServiceTrait) isForcefullyEnabled() bool {
 	return pointer.BoolDeref(t.Enabled, false) && !pointer.BoolDeref(t.Auto, true)
 }

diff --git a/pkg/trait/logging.go b/pkg/trait/logging.go
@@ -58,15 +58,12 @@ func (l loggingTrait) Configure(e *Environment) (bool, *TraitCondition, error) {
 	if !pointer.BoolDeref(l.Enabled, true) {
 		return false, NewIntegrationConditionUserDisabled("Logging"), nil
 	}
-	if e.CamelCatalog == nil {
-		return false, NewIntegrationConditionPlatformDisabledCatalogMissing(), nil
-	}
 
 	return e.IntegrationInRunningPhases(), nil, nil
 }
 
 func (l loggingTrait) Apply(e *Environment) error {
-	if e.CamelCatalog.Runtime.Capabilities["logging"].RuntimeProperties != nil {
+	if e.CamelCatalog != nil && e.CamelCatalog.Runtime.Capabilities["logging"].RuntimeProperties != nil {
 		l.setCatalogConfiguration(e)
 	} else {
 		l.setEnvConfiguration(e)

diff --git a/pkg/trait/logging_test.go b/pkg/trait/logging_test.go
@@ -32,6 +32,7 @@ import (
 	traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
 	"github.com/apache/camel-k/v2/pkg/util/boolean"
 	"github.com/apache/camel-k/v2/pkg/util/camel"
+	"github.com/apache/camel-k/v2/pkg/util/envvar"
 	"github.com/apache/camel-k/v2/pkg/util/kubernetes"
 	"github.com/apache/camel-k/v2/pkg/util/test"
 )
@@ -152,3 +153,21 @@ func TestJsonLoggingTrait(t *testing.T) {
 	assert.Equal(t, "${camel.k.logging.jsonPrettyPrint}", env.ApplicationProperties["quarkus.log.console.json.pretty-print"])
 	assert.Equal(t, "", env.ApplicationProperties["quarkus.console.color"])
 }
+
+func TestDefaultQuarkusLogging(t *testing.T) {
+	env := createDefaultLoggingTestEnv(t)
+	// Simulate a synthetic Integration Kit for which the catalog is not available
+	env.CamelCatalog = nil
+	env.IntegrationKit.Labels = map[string]string{
+		v1.IntegrationKitTypeLabel: v1.IntegrationKitTypeSynthetic,
+	}
+	env.EnvVars = []corev1.EnvVar{}
+	conditions, err := NewLoggingTestCatalog().apply(env)
+
+	require.NoError(t, err)
+	assert.NotEmpty(t, conditions)
+	assert.NotEmpty(t, env.ExecutedTraits)
+
+	assert.Equal(t, &corev1.EnvVar{Name: "QUARKUS_LOG_LEVEL", Value: "INFO"}, envvar.Get(env.EnvVars, envVarQuarkusLogLevel))
+	assert.Equal(t, &corev1.EnvVar{Name: "QUARKUS_LOG_CONSOLE_JSON", Value: "false"}, envvar.Get(env.EnvVars, envVarQuarkusLogConsoleJSON))
+}