This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit beff4641a7d7f5a99209207886f9b03784ac95bd Author: Luca Burgazzoli <lburgazz...@gmail.com> AuthorDate: Wed Aug 3 13:47:26 2022 +0200 fix: resolve pr review findings #3479 --- .../common/kamelet_binding_with_image_test.go | 16 ++++++---------- e2e/support/test_support.go | 6 +++++- .../integration/integration_controller.go | 4 ++-- pkg/controller/integration/kits.go | 2 +- pkg/controller/kameletbinding/monitor.go | 4 ++-- pkg/trait/util.go | 22 +++++++++++----------- pkg/trait/util_test.go | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/e2e/global/common/kamelet_binding_with_image_test.go b/e2e/global/common/kamelet_binding_with_image_test.go index 129089e51..e28132c59 100644 --- a/e2e/global/common/kamelet_binding_with_image_test.go +++ b/e2e/global/common/kamelet_binding_with_image_test.go @@ -79,13 +79,11 @@ func TestBindingWithImage(t *testing.T) { To(Succeed()) Eventually(IntegrationGeneration(ns, bindingID)). Should(gstruct.PointTo(BeNumerically("==", 1))) - Eventually(IntegrationAnnotations(ns, bindingID)). - Should(HaveKeyWithValue("test", "1")) - Eventually(IntegrationAnnotations(ns, bindingID)). - Should(HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage)) + Eventually(Integration(ns, bindingID)).Should(WithTransform(Annotations, And( + HaveKeyWithValue("test", "1"))), + HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage)) Eventually(IntegrationStatusImage(ns, bindingID)). Should(Equal(expectedImage)) - Eventually(IntegrationPodPhase(ns, bindingID), TestTimeoutLong). Should(Equal(corev1.PodRunning)) Eventually(IntegrationPodImage(ns, bindingID)). @@ -101,13 +99,11 @@ func TestBindingWithImage(t *testing.T) { To(Succeed()) Eventually(IntegrationGeneration(ns, bindingID)). Should(gstruct.PointTo(BeNumerically("==", 1))) - Eventually(IntegrationAnnotations(ns, bindingID)). - Should(HaveKeyWithValue("test", "2")) - Eventually(IntegrationAnnotations(ns, bindingID)). - Should(HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage)) + Eventually(Integration(ns, bindingID)).Should(WithTransform(Annotations, And( + HaveKeyWithValue("test", "2"))), + HaveKeyWithValue("trait.camel.apache.org/container.image", expectedImage)) Eventually(IntegrationStatusImage(ns, bindingID)). Should(Equal(expectedImage)) - Eventually(IntegrationPodPhase(ns, bindingID), TestTimeoutLong). Should(Equal(corev1.PodRunning)) Eventually(IntegrationPodImage(ns, bindingID)). diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go index 8cfa8d1fa..509c3b3ff 100644 --- a/e2e/support/test_support.go +++ b/e2e/support/test_support.go @@ -555,7 +555,7 @@ func IntegrationGeneration(ns string, name string) func() *int64 { } } -func IntegrationStatusObserverGeneration(ns string, name string) func() *int64 { +func IntegrationObservedGeneration(ns string, name string) func() *int64 { return func() *int64 { it := Integration(ns, name)() if it == nil { @@ -643,6 +643,10 @@ func AssignIntegrationToOperator(ns, name, operator string) error { return TestClient().Update(TestContext, it) } +func Annotations(object metav1.Object) map[string]string { + return object.GetAnnotations() +} + func Lease(ns string, name string) func() *coordination.Lease { return func() *coordination.Lease { lease := coordination.Lease{} diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go index 0d0f61d20..bd9a19937 100644 --- a/pkg/controller/integration/integration_controller.go +++ b/pkg/controller/integration/integration_controller.go @@ -127,11 +127,11 @@ func integrationKitEnqueueRequestsFromMapFunc(c client.Client, kit *v1.Integrati for i := range list.Items { integration := &list.Items[i] - log.Debug("Integration Controller: Assessing integration", "integration", integration.Name, "namespace", integration.Namespace) + Log.Debug("Integration Controller: Assessing integration", "integration", integration.Name, "namespace", integration.Namespace) match, err := sameOrMatch(kit, integration) if err != nil { - log.Errorf(err, "Error matching integration %q with kit %q", integration.Name, kit.Name) + Log.ForIntegration(integration).Errorf(err, "Error matching integration %q with kit %q", integration.Name, kit.Name) continue } if !match { diff --git a/pkg/controller/integration/kits.go b/pkg/controller/integration/kits.go index 72b504e86..1e4bd9b84 100644 --- a/pkg/controller/integration/kits.go +++ b/pkg/controller/integration/kits.go @@ -189,7 +189,7 @@ func kitMatches(kit1 *v1.IntegrationKit, kit2 *v1.IntegrationKit) (bool, error) return true, nil } -func hasMatchingTraits(traitMap trait.Unstructured, kitTraitMap trait.Unstructured) (bool, error) { +func hasMatchingTraits(traitMap trait.Options, kitTraitMap trait.Options) (bool, error) { catalog := trait.NewCatalog(nil) for _, t := range catalog.AllTraits() { diff --git a/pkg/controller/kameletbinding/monitor.go b/pkg/controller/kameletbinding/monitor.go index dc62ea1a9..04a4e546c 100644 --- a/pkg/controller/kameletbinding/monitor.go +++ b/pkg/controller/kameletbinding/monitor.go @@ -92,10 +92,10 @@ func (action *monitorAction) Handle(ctx context.Context, kameletbinding *v1alpha if !semanticEquality || operatorIDChanged || !sameTraits { action.L.Info( - "Monitor: KameletBinding needs a rebuild", + "KameletBinding needs a rebuild", "semantic-equality", !semanticEquality, "operatorid-changed", operatorIDChanged, - "traites-changed", !sameTraits) + "traits-changed", !sameTraits) // KameletBinding has changed and needs rebuild target := kameletbinding.DeepCopy() diff --git a/pkg/trait/util.go b/pkg/trait/util.go index 2b71cd960..737b54883 100644 --- a/pkg/trait/util.go +++ b/pkg/trait/util.go @@ -41,9 +41,9 @@ import ( "github.com/apache/camel-k/pkg/util/property" ) -type Unstructured map[string]map[string]interface{} +type Options map[string]map[string]interface{} -func (u Unstructured) Get(id string) (map[string]interface{}, bool) { +func (u Options) Get(id string) (map[string]interface{}, bool) { if t, ok := u[id]; ok { return t, true } @@ -256,7 +256,7 @@ func AssertTraitsType(traits interface{}) error { } // ToTraitMap accepts either v1.Traits or v1.IntegrationKitTraits and converts it to a map of traits. -func ToTraitMap(traits interface{}) (Unstructured, error) { +func ToTraitMap(traits interface{}) (Options, error) { if err := AssertTraitsType(traits); err != nil { return nil, err } @@ -265,7 +265,7 @@ func ToTraitMap(traits interface{}) (Unstructured, error) { if err != nil { return nil, err } - traitMap := make(Unstructured) + traitMap := make(Options) if err = json.Unmarshal(data, &traitMap); err != nil { return nil, err } @@ -341,7 +341,7 @@ func getBuilderTask(tasks []v1.Task) *v1.BuilderTask { } // Equals return if traits are the same. -func Equals(i1 Unstructured, i2 Unstructured) bool { +func Equals(i1 Options, i2 Options) bool { return reflect.DeepEqual(i1, i2) } @@ -415,7 +415,7 @@ func IntegrationAndKitHaveSameTraits(i1 *v1.Integration, i2 *v1.IntegrationKit) return Equals(c1, c2), nil } -func NewUnstructuredTraitsForIntegration(i *v1.Integration) (Unstructured, error) { +func NewUnstructuredTraitsForIntegration(i *v1.Integration) (Options, error) { m1, err := ToTraitMap(i.Spec.Traits) if err != nil { return nil, err @@ -433,7 +433,7 @@ func NewUnstructuredTraitsForIntegration(i *v1.Integration) (Unstructured, error return m1, nil } -func NewUnstructuredTraitsForIntegrationKit(i *v1.IntegrationKit) (Unstructured, error) { +func NewUnstructuredTraitsForIntegrationKit(i *v1.IntegrationKit) (Options, error) { m1, err := ToTraitMap(i.Spec.Traits) if err != nil { return nil, err @@ -451,7 +451,7 @@ func NewUnstructuredTraitsForIntegrationKit(i *v1.IntegrationKit) (Unstructured, return m1, nil } -func NewUnstructuredTraitsForIntegrationPlatform(i *v1.IntegrationPlatform) (Unstructured, error) { +func NewUnstructuredTraitsForIntegrationPlatform(i *v1.IntegrationPlatform) (Options, error) { m1, err := ToTraitMap(i.Spec.Traits) if err != nil { return nil, err @@ -469,7 +469,7 @@ func NewUnstructuredTraitsForIntegrationPlatform(i *v1.IntegrationPlatform) (Uns return m1, nil } -func NewUnstructuredTraitsForKameletBinding(i *v1alpha1.KameletBinding) (Unstructured, error) { +func NewUnstructuredTraitsForKameletBinding(i *v1alpha1.KameletBinding) (Options, error) { if i.Spec.Integration != nil { m1, err := ToTraitMap(i.Spec.Integration.Traits) if err != nil { @@ -496,8 +496,8 @@ func NewUnstructuredTraitsForKameletBinding(i *v1alpha1.KameletBinding) (Unstruc return m1, nil } -func FromAnnotations(meta *metav1.ObjectMeta) (Unstructured, error) { - options := make(Unstructured) +func FromAnnotations(meta *metav1.ObjectMeta) (Options, error) { + options := make(Options) for k, v := range meta.Annotations { if strings.HasPrefix(k, v1.TraitAnnotationPrefix) { diff --git a/pkg/trait/util_test.go b/pkg/trait/util_test.go index 192943147..7c19d9332 100644 --- a/pkg/trait/util_test.go +++ b/pkg/trait/util_test.go @@ -58,7 +58,7 @@ func TestToTraitMap(t *testing.T) { }), }, } - expected := Unstructured{ + expected := Options{ "container": { "enabled": true, "auto": false,