You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/09/13 10:46:16 UTC

[camel-k] 02/03: fix(trait): remove logging warning

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit c578e497fb101c809899149742e875e58258a059
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Sep 12 15:02:19 2023 +0200

    fix(trait): remove logging warning
    
    Ref #4709
---
 pkg/trait/logging.go      | 4 ++--
 pkg/trait/logging_test.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/trait/logging.go b/pkg/trait/logging.go
index 34efbafb6..3e3590b78 100644
--- a/pkg/trait/logging.go
+++ b/pkg/trait/logging.go
@@ -25,8 +25,8 @@ import (
 )
 
 const (
+	envVarQuarkusConsoleColor     = "QUARKUS_CONSOLE_COLOR"
 	envVarQuarkusLogLevel         = "QUARKUS_LOG_LEVEL"
-	envVarQuarkusLogConsoleColor  = "QUARKUS_LOG_CONSOLE_COLOR"
 	envVarQuarkusLogConsoleFormat = "QUARKUS_LOG_CONSOLE_FORMAT"
 	// nolint: gosec // no sensitive credentials
 	envVarQuarkusLogConsoleJSON            = "QUARKUS_LOG_CONSOLE_JSON"
@@ -73,7 +73,7 @@ func (l loggingTrait) Apply(e *Environment) error {
 		envvar.SetVal(&e.EnvVars, envVarQuarkusLogConsoleJSON, False)
 
 		if pointer.BoolDeref(l.Color, true) {
-			envvar.SetVal(&e.EnvVars, envVarQuarkusLogConsoleColor, True)
+			envvar.SetVal(&e.EnvVars, envVarQuarkusConsoleColor, True)
 		}
 	}
 
diff --git a/pkg/trait/logging_test.go b/pkg/trait/logging_test.go
index 288cbfe21..2dad88db3 100644
--- a/pkg/trait/logging_test.go
+++ b/pkg/trait/logging_test.go
@@ -122,7 +122,7 @@ func TestEmptyLoggingTrait(t *testing.T) {
 	logFormatIsNotDefault := false
 
 	for _, e := range env.EnvVars {
-		if e.Name == envVarQuarkusLogConsoleColor {
+		if e.Name == envVarQuarkusConsoleColor {
 			if e.Value == "true" {
 				quarkusConsoleColor = true
 			}
@@ -174,7 +174,7 @@ func TestJsonLoggingTrait(t *testing.T) {
 	logFormatIsNotDefault := false
 
 	for _, e := range env.EnvVars {
-		if e.Name == envVarQuarkusLogConsoleColor {
+		if e.Name == envVarQuarkusConsoleColor {
 			if e.Value == "true" {
 				quarkusConsoleColor = true
 			}