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/04/26 08:51:29 UTC
[camel-k] 13/18: fix(lint): various
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 24fd12de9eb3249ab2e2768ed2c9aeb93045c18a
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Apr 4 09:59:27 2023 +0200
fix(lint): various
---
pkg/controller/kameletbinding/monitor.go | 32 --------------------------------
pkg/event/manager.go | 4 ++--
pkg/trait/util.go | 6 +++---
pkg/util/bindings/api_support.go | 2 +-
pkg/util/bindings/api_v1alpha1.go | 6 +++---
pkg/util/bindings/catalog.go | 10 +++++-----
pkg/util/bindings/v1alpha1_kamelet.go | 2 +-
pkg/util/log/log.go | 2 +-
8 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/pkg/controller/kameletbinding/monitor.go b/pkg/controller/kameletbinding/monitor.go
index 26cbea1f0..8c8656316 100644
--- a/pkg/controller/kameletbinding/monitor.go
+++ b/pkg/controller/kameletbinding/monitor.go
@@ -154,38 +154,6 @@ func (action *monitorAction) Handle(ctx context.Context, binding *v1alpha1.Kamel
return target, nil
}
-func setBindingReadyCondition(kb *v1.Binding, it *v1.Integration) {
- if condition := it.Status.GetCondition(v1.IntegrationConditionReady); condition != nil {
- message := condition.Message
- if message == "" {
- message = fmt.Sprintf("Integration %q readiness condition is %q", it.GetName(), condition.Status)
- }
-
- c := v1.BindingCondition{
- Type: v1.BindingConditionReady,
- Status: condition.Status,
- Reason: condition.Reason,
- Message: message,
- }
-
- if condition.Pods != nil {
- c.Pods = make([]v1.PodCondition, 0, len(condition.Pods))
- c.Pods = append(c.Pods, condition.Pods...)
- }
-
- kb.Status.SetConditions(c)
-
- } else {
- kb.Status.SetCondition(
- v1.BindingConditionReady,
- corev1.ConditionUnknown,
- "",
- fmt.Sprintf("Integration %q does not have a readiness condition", it.GetName()),
- )
- }
-}
-
-// Deprecated
func setKameletBindingReadyCondition(kb *v1alpha1.KameletBinding, it *v1.Integration) {
if condition := it.Status.GetCondition(v1.IntegrationConditionReady); condition != nil {
message := condition.Message
diff --git a/pkg/event/manager.go b/pkg/event/manager.go
index 55c788589..849842936 100644
--- a/pkg/event/manager.go
+++ b/pkg/event/manager.go
@@ -256,7 +256,7 @@ func NotifyBindingError(ctx context.Context, c client.Client, recorder record.Ev
}
// NotifyKameletBindingUpdated automatically generates events when a KameletBinding changes.
-// Deprecated
+// Deprecated.
func NotifyKameletBindingUpdated(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.KameletBinding) {
if newResource == nil {
return
@@ -274,7 +274,7 @@ func NotifyKameletBindingUpdated(ctx context.Context, c client.Client, recorder
}
// NotifyKameletBindingError automatically generates error events when the binding reconcile cycle phase has an error.
-// Deprecated
+// Deprecated.
func NotifyKameletBindingError(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.KameletBinding, err error) {
k := old
if newResource != nil {
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index fa7d03229..afd40e55c 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -389,7 +389,7 @@ func BindingsHaveSameTraits(i1 *v1.Binding, i2 *v1.Binding) (bool, error) {
}
// KameletBindingsHaveSameTraits return if traits are the same.
-// Deprecated
+// Deprecated.
func KameletBindingsHaveSameTraits(i1 *v1alpha1.KameletBinding, i2 *v1alpha1.KameletBinding) (bool, error) {
c1, err := NewTraitsOptionsForKameletBinding(i1)
if err != nil {
@@ -429,7 +429,7 @@ func IntegrationAndBindingSameTraits(i1 *v1.Integration, i2 *v1.Binding) (bool,
// IntegrationAndBindingSameTraits return if traits are the same.
// The comparison is done for the subset of traits defines on the binding as during the trait processing,
// some traits may be added to the Integration i.e. knative configuration in case of sink binding.
-// Deprecated
+// Deprecated.
func IntegrationAndKameletBindingSameTraits(i1 *v1.Integration, i2 *v1alpha1.KameletBinding) (bool, error) {
itOpts, err := NewTraitsOptionsForIntegration(i1)
if err != nil {
@@ -545,7 +545,7 @@ func NewTraitsOptionsForBinding(i *v1.Binding) (Options, error) {
return m1, nil
}
-// Deprecated
+// Deprecated.
func NewTraitsOptionsForKameletBinding(i *v1alpha1.KameletBinding) (Options, error) {
if i.Spec.Integration != nil {
m1, err := ToTraitMap(i.Spec.Integration.Traits)
diff --git a/pkg/util/bindings/api_support.go b/pkg/util/bindings/api_support.go
index c06b5a123..8ed0970cc 100644
--- a/pkg/util/bindings/api_support.go
+++ b/pkg/util/bindings/api_support.go
@@ -42,7 +42,7 @@ func (c EndpointContext) GenerateID() string {
}
// GenerateID generates an identifier based on the context type and its optional position.
-// Deprecated
+// Deprecated.
func (c V1alpha1EndpointContext) GenerateID() string {
id := string(c.Type)
if c.Position != nil {
diff --git a/pkg/util/bindings/api_v1alpha1.go b/pkg/util/bindings/api_v1alpha1.go
index 7639a2f91..8d97e8023 100644
--- a/pkg/util/bindings/api_v1alpha1.go
+++ b/pkg/util/bindings/api_v1alpha1.go
@@ -27,7 +27,7 @@ import (
)
// V1alpha1BindingProvider maps a Binding endpoint into Camel K resources.
-// Deprecated
+// Deprecated.
type V1alpha1BindingProvider interface {
// ID returns the name of the binding provider
ID() string
@@ -39,7 +39,7 @@ type V1alpha1BindingProvider interface {
// V1alpha1BindingContext --
// nolint: containedctx
-// Deprecated
+// Deprecated.
type V1alpha1BindingContext struct {
Ctx context.Context
Client client.Client
@@ -48,7 +48,7 @@ type V1alpha1BindingContext struct {
}
// V1alpha1EndpointContext --
-// Deprecated
+// Deprecated.
type V1alpha1EndpointContext struct {
Type v1alpha1.EndpointType
Position *int
diff --git a/pkg/util/bindings/catalog.go b/pkg/util/bindings/catalog.go
index ce3199fed..a2119bb4b 100644
--- a/pkg/util/bindings/catalog.go
+++ b/pkg/util/bindings/catalog.go
@@ -27,7 +27,7 @@ import (
var bindingProviders []BindingProvider
-// RegisterBindingProvider --
+// RegisterBindingProvider --.
func RegisterBindingProvider(bp BindingProvider) {
bindingProviders = append(bindingProviders, bp)
sort.Slice(bindingProviders, func(i, j int) bool {
@@ -38,11 +38,11 @@ func RegisterBindingProvider(bp BindingProvider) {
})
}
-// Deprecated
+// Deprecated.
var v1alpha1BindingProviders []V1alpha1BindingProvider
// V1alpha1RegisterBindingProvider --
-// Deprecated
+// Deprecated.
func V1alpha1RegisterBindingProvider(bp V1alpha1BindingProvider) {
v1alpha1BindingProviders = append(v1alpha1BindingProviders, bp)
sort.Slice(v1alpha1BindingProviders, func(i, j int) bool {
@@ -81,7 +81,7 @@ func validateEndpoint(ctx BindingContext, e v1.Endpoint) error {
}
// TranslateV1alpha1 execute all chained binding providers, returning the first success or the first error.
-// Deprecated
+// Deprecated.
func TranslateV1alpha1(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, endpoint v1alpha1.Endpoint) (*Binding, error) {
if err := validateEndpointV1alpha1(ctx, endpoint); err != nil {
return nil, err
@@ -96,7 +96,7 @@ func TranslateV1alpha1(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointC
return nil, nil
}
-// Deprecated
+// Deprecated.
func validateEndpointV1alpha1(ctx V1alpha1BindingContext, e v1alpha1.Endpoint) error {
if e.Ref == nil && e.URI == nil {
return errors.New("no ref or URI specified in endpoint")
diff --git a/pkg/util/bindings/v1alpha1_kamelet.go b/pkg/util/bindings/v1alpha1_kamelet.go
index 682db9317..30734fc7b 100644
--- a/pkg/util/bindings/v1alpha1_kamelet.go
+++ b/pkg/util/bindings/v1alpha1_kamelet.go
@@ -28,7 +28,7 @@ import (
)
// V1alpha1BindingConverter converts a reference to a Kamelet into a Camel URI.
-// Deprecated
+// Deprecated.
type V1alpha1BindingConverter struct{}
func (k V1alpha1BindingConverter) ID() string {
diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go
index c3ef3ae11..398cd93bc 100644
--- a/pkg/util/log/log.go
+++ b/pkg/util/log/log.go
@@ -150,7 +150,7 @@ func (l Logger) ForBinding(target *v1.Binding) Logger {
}
// ForKameletBinding --.
-// Deprecated: use ForBinding instead
+// Deprecated: use ForBinding instead.
func (l Logger) ForKameletBinding(target *v1alpha1.KameletBinding) Logger {
return l.WithValues(
"api-version", target.APIVersion,