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 b1b81381576430bd5a352660ac68d5d6dad835f4 Author: Pasquale Congiusti <[email protected]> AuthorDate: Fri Oct 25 07:41:35 2024 +0200 chore(trait): make public constant --- pkg/trait/builder.go | 4 ++-- pkg/trait/camel.go | 2 +- pkg/trait/camel_test.go | 4 ++-- pkg/trait/deployer.go | 2 +- pkg/trait/jvm.go | 2 +- pkg/trait/openapi.go | 2 +- pkg/trait/quarkus.go | 4 ++-- pkg/trait/service_binding.go | 2 +- pkg/trait/telemetry.go | 2 +- pkg/trait/trait_catalog.go | 2 +- pkg/trait/trait_condition_types.go | 6 +++--- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go index 24d28d744..ae17e0872 100644 --- a/pkg/trait/builder.go +++ b/pkg/trait/builder.go @@ -188,7 +188,7 @@ func (t *builderTrait) adaptDeprecatedFields() *TraitCondition { m := "The limit-memory parameter is deprecated and may be removed in future releases. Make sure to use tasks-limit-memory parameter instead." t.L.Info(m) if condition == nil { - condition = NewIntegrationCondition("Builder", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, "") + condition = NewIntegrationCondition("Builder", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, TraitConfigurationReason, "") } condition = newOrAppend(condition, m) t.TasksLimitMemory = append(t.TasksLimitMemory, fmt.Sprintf("builder:%s", t.LimitMemory)) @@ -199,7 +199,7 @@ func (t *builderTrait) adaptDeprecatedFields() *TraitCondition { func newOrAppend(condition *TraitCondition, message string) *TraitCondition { if condition == nil { - condition = NewIntegrationCondition("Builder", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, message) + condition = NewIntegrationCondition("Builder", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, TraitConfigurationReason, message) } else { condition.message += "; " + message } diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go index 53eccf51c..6e2db3cdb 100644 --- a/pkg/trait/camel.go +++ b/pkg/trait/camel.go @@ -90,7 +90,7 @@ func (t *camelTrait) Configure(e *Environment) (bool, *TraitCondition, error) { "Camel", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, - traitConfigurationReason, + TraitConfigurationReason, fmt.Sprintf( "Operated with CamelCatalog version %s which may be different from the runtime used in the container", t.runtimeVersion, diff --git a/pkg/trait/camel_test.go b/pkg/trait/camel_test.go index 0513ebe9c..a7d20d25c 100644 --- a/pkg/trait/camel_test.go +++ b/pkg/trait/camel_test.go @@ -81,7 +81,7 @@ func TestApplyCamelTraitNonManagedBuild(t *testing.T) { "Camel", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, - traitConfigurationReason, + TraitConfigurationReason, fmt.Sprintf( "Operated with CamelCatalog version %s which may be different from the runtime used in the container", "0.0.1", @@ -243,7 +243,7 @@ func TestApplyCamelTraitNonManagedBuildWithProperties(t *testing.T) { "Camel", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, - traitConfigurationReason, + TraitConfigurationReason, fmt.Sprintf( "Operated with CamelCatalog version %s which may be different from the runtime used in the container", "0.0.1", diff --git a/pkg/trait/deployer.go b/pkg/trait/deployer.go index 65051e53a..f88670ee4 100644 --- a/pkg/trait/deployer.go +++ b/pkg/trait/deployer.go @@ -58,7 +58,7 @@ func (t *deployerTrait) Configure(e *Environment) (bool, *TraitCondition, error) "Deployer", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, - traitConfigurationReason, + TraitConfigurationReason, "The use-ssa parameter is deprecated and may be removed in future releases.", ) } diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go index 096d31530..fc04dd5eb 100644 --- a/pkg/trait/jvm.go +++ b/pkg/trait/jvm.go @@ -64,7 +64,7 @@ func (t *jvmTrait) Configure(e *Environment) (bool, *TraitCondition, error) { // Deprecated: the JVM has to be a platform trait and the user should not be able to disable it if !ptr.Deref(t.Enabled, true) { notice := userDisabledMessage + "; this configuration is deprecated and may be removed within next releases" - return false, NewIntegrationCondition("JVM", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, notice), nil + return false, NewIntegrationCondition("JVM", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, TraitConfigurationReason, notice), nil } if (e.IntegrationKit != nil && !e.IntegrationKitInPhase(v1.IntegrationKitPhaseReady)) || !e.IntegrationInRunningPhases() { diff --git a/pkg/trait/openapi.go b/pkg/trait/openapi.go index 4b1a1100b..4a8959164 100644 --- a/pkg/trait/openapi.go +++ b/pkg/trait/openapi.go @@ -68,7 +68,7 @@ func (t *openAPITrait) Configure(e *Environment) (bool, *TraitCondition, error) "OpenApi", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, - traitConfigurationReason, + TraitConfigurationReason, "OpenApi trait is deprecated and may be removed in future version: "+ "use Camel REST contract first instead, https://camel.apache.org/manual/rest-dsl-openapi.html";, ) diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go index 9c1638260..4cca2e35a 100644 --- a/pkg/trait/quarkus.go +++ b/pkg/trait/quarkus.go @@ -148,7 +148,7 @@ func (t *quarkusTrait) Configure(e *Environment) (bool, *TraitCondition, error) message := "The sources contains some language marked as deprecated. This Integration may not be supported in future release." if condition == nil { condition = NewIntegrationCondition( - "Quarkus", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, message) + "Quarkus", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, TraitConfigurationReason, message) } else { condition.message += message } @@ -182,7 +182,7 @@ func (t *quarkusTrait) adaptDeprecatedFields() *TraitCondition { t.Modes = append(t.Modes, traitv1.JvmQuarkusMode) } } - return NewIntegrationCondition("Quarkus", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, message) + return NewIntegrationCondition("Quarkus", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, TraitConfigurationReason, message) } return nil diff --git a/pkg/trait/service_binding.go b/pkg/trait/service_binding.go index def9c6d62..ce790e8ae 100644 --- a/pkg/trait/service_binding.go +++ b/pkg/trait/service_binding.go @@ -85,7 +85,7 @@ func (t *serviceBindingTrait) Configure(e *Environment) (bool, *TraitCondition, "ServiceBinding", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, - traitConfigurationReason, + TraitConfigurationReason, "ServiceBinding trait is deprecated as the Service Binding Operator is no longer supported. It may be removed in future version.", ) } diff --git a/pkg/trait/telemetry.go b/pkg/trait/telemetry.go index c6be72574..3eb820e89 100644 --- a/pkg/trait/telemetry.go +++ b/pkg/trait/telemetry.go @@ -75,7 +75,7 @@ func (t *telemetryTrait) Configure(e *Environment) (bool, *TraitCondition, error "Telemetry", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, - traitConfigurationReason, + TraitConfigurationReason, "Telemetry addon configuration is deprecated and may be removed in future releases. Make sure to use Telemetry trait configuration instead.", ) } diff --git a/pkg/trait/trait_catalog.go b/pkg/trait/trait_catalog.go index bdf62d009..a76339bab 100644 --- a/pkg/trait/trait_catalog.go +++ b/pkg/trait/trait_catalog.go @@ -182,7 +182,7 @@ func (c *Catalog) executedTraitCondition(executedTrait []Trait) (*TraitCondition message := fmt.Sprintf("Applied traits: %s", strings.Join(traitIds, ",")) c.L.Debugf(message) - return NewIntegrationCondition("", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, message), traits, nil + return NewIntegrationCondition("", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, TraitConfigurationReason, message), traits, nil } // Deprecated: remove this check when we include the addons traits into regular traits diff --git a/pkg/trait/trait_condition_types.go b/pkg/trait/trait_condition_types.go index 942a3dbd6..8baf4b1df 100644 --- a/pkg/trait/trait_condition_types.go +++ b/pkg/trait/trait_condition_types.go @@ -26,7 +26,7 @@ import ( ) const ( - traitConfigurationReason = "TraitConfiguration" + TraitConfigurationReason = "TraitConfiguration" userDisabledMessage = "explicitly disabled by the user" userEnabledMessage = "explicitly enabled by the user" platformDisabledMessage = "explicitly disabled by the platform" @@ -53,11 +53,11 @@ func NewIntegrationCondition(traitID string, ict v1.IntegrationConditionType, cs } func NewIntegrationConditionUserDisabled(traitID string) *TraitCondition { - return NewIntegrationCondition(traitID, v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, userDisabledMessage) + return NewIntegrationCondition(traitID, v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, TraitConfigurationReason, userDisabledMessage) } func NewIntegrationConditionPlatformDisabledWithMessage(traitID string, message string) *TraitCondition { - return NewIntegrationCondition(traitID, v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, fmt.Sprintf("%s: %s", platformDisabledMessage, message)) + return NewIntegrationCondition(traitID, v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, TraitConfigurationReason, fmt.Sprintf("%s: %s", platformDisabledMessage, message)) } func (tc *TraitCondition) integrationCondition() (v1.IntegrationConditionType, corev1.ConditionStatus, string, string) {
