[camel-k] 01/02: fix: Unrecognized configuration from quarkus-logging-json

[astefanutti]

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 1b440b9dd6dbf9b90229366cb1fda80bc1d43450
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Mon Jun 28 13:41:39 2021 +0200

    fix: Unrecognized configuration from quarkus-logging-json
---
 pkg/trait/logging.go      | 29 ++++++++++++-----------------
 pkg/trait/logging_test.go | 13 ++++++++-----
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/pkg/trait/logging.go b/pkg/trait/logging.go
index 72e6589..f7f103a 100644
--- a/pkg/trait/logging.go
+++ b/pkg/trait/logging.go
@@ -18,8 +18,6 @@ limitations under the License.
 package trait
 
 import (
-       "strconv"
-
        v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
        "github.com/apache/camel-k/pkg/util"
        "github.com/apache/camel-k/pkg/util/envvar"
@@ -32,7 +30,6 @@ const (
        envVarQuarkusLogConsoleJson            = "QUARKUS_LOG_CONSOLE_JSON"
        envVarQuarkusLogConsoleJsonPrettyPrint = 
"QUARKUS_LOG_CONSOLE_JSON_PRETTY_PRINT"
        depQuarkusLoggingJson                  = "quarkus-logging-json"
-       defaultLogFormat                       = ""
        defaultLogLevel                        = "INFO"
 )
 
@@ -56,17 +53,13 @@ type loggingTrait struct {
 
 func newLoggingTraitTrait() Trait {
        return &loggingTrait{
-               BaseTrait:       NewBaseTrait("logging", 800),
-               Color:           util.BoolP(true),
-               Format:          defaultLogFormat,
-               Level:           defaultLogLevel,
-               Json:            util.BoolP(false),
-               JsonPrettyPrint: util.BoolP(false),
+               BaseTrait: NewBaseTrait("logging", 800),
+               Level:     defaultLogLevel,
        }
 }
 
 func (l loggingTrait) Configure(environment *Environment) (bool, error) {
-       if l.Enabled != nil && !*l.Enabled {
+       if util.IsFalse(l.Enabled) {
                return false, nil
        }
 
@@ -76,7 +69,7 @@ func (l loggingTrait) Configure(environment *Environment) 
(bool, error) {
 
 func (l loggingTrait) Apply(environment *Environment) error {
        if environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
-               if *l.Json {
+               if util.IsTrue(l.Json) {
                        if environment.Integration.Status.Dependencies == nil {
                                environment.Integration.Status.Dependencies = 
make([]string, 0)
                        }
@@ -88,15 +81,17 @@ func (l loggingTrait) Apply(environment *Environment) error 
{
 
        envvar.SetVal(&environment.EnvVars, envVarQuarkusLogLevel, l.Level)
 
-       if l.Format != defaultLogFormat {
+       if l.Format != "" {
                envvar.SetVal(&environment.EnvVars, 
envVarQuarkusLogConsoleFormat, l.Format)
        }
 
-       envvar.SetVal(&environment.EnvVars, envVarQuarkusLogConsoleJson, 
strconv.FormatBool(*l.Json))
-       envvar.SetVal(&environment.EnvVars, 
envVarQuarkusLogConsoleJsonPrettyPrint, strconv.FormatBool(*l.JsonPrettyPrint))
-
-       if !*l.Json {
-               envvar.SetVal(&environment.EnvVars, 
envVarQuarkusLogConsoleColor, strconv.FormatBool(*l.Color))
+       if util.IsTrue(l.Json) {
+               envvar.SetVal(&environment.EnvVars, 
envVarQuarkusLogConsoleJson, True)
+               if util.IsTrue(l.JsonPrettyPrint) {
+                       envvar.SetVal(&environment.EnvVars, 
envVarQuarkusLogConsoleJsonPrettyPrint, True)
+               }
+       } else if util.IsNilOrTrue(l.Color) {
+               envvar.SetVal(&environment.EnvVars, 
envVarQuarkusLogConsoleColor, True)
        }
 
        return nil
diff --git a/pkg/trait/logging_test.go b/pkg/trait/logging_test.go
index e165b1e..f5fc573 100644
--- a/pkg/trait/logging_test.go
+++ b/pkg/trait/logging_test.go
@@ -19,14 +19,17 @@ package trait
 
 import (
        "context"
+       "testing"
+
+       "github.com/stretchr/testify/assert"
+
+       corev1 "k8s.io/api/core/v1"
+       metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
        v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
        "github.com/apache/camel-k/pkg/util/camel"
        "github.com/apache/camel-k/pkg/util/kubernetes"
        "github.com/apache/camel-k/pkg/util/test"
-       "github.com/stretchr/testify/assert"
-       corev1 "k8s.io/api/core/v1"
-       metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-       "testing"
 )
 
 func createLoggingTestEnv(t *testing.T, color bool, json bool, jsonPrettyPrint 
bool, logLevel string, logFormat string) *Environment {
@@ -82,7 +85,7 @@ func createLoggingTestEnv(t *testing.T, color bool, json 
bool, jsonPrettyPrint b
 }
 
 func createDefaultLoggingTestEnv(t *testing.T) *Environment {
-       return createLoggingTestEnv(t, true, false, false, defaultLogLevel, 
defaultLogFormat)
+       return createLoggingTestEnv(t, true, false, false, defaultLogLevel, "")
 }
 
 func NewLoggingTestCatalog() *Catalog {