[camel-k] 04/06: re-enable Flow >> Template conversion, fix v1/v1alpha1.RawMessage type errors

[djencks]

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

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

commit e1474f3d0f10132bc6894ead0420e0d236d2c52a
Author: David Jencks <djen...@apache.org>
AuthorDate: Wed Jan 26 18:31:55 2022 -0800

    re-enable Flow >> Template conversion, fix v1/v1alpha1.RawMessage type 
errors
---
 pkg/cmd/bind.go                                |  2 +-
 pkg/controller/kameletbinding/error_handler.go |  5 ++---
 pkg/trait/kamelets.go                          | 15 ++++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index b81d49d..4e581ce 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -343,7 +343,7 @@ func (o *bindCmdOptions) asEndpointProperties(props 
map[string]string) (*v1alpha
                return nil, err
        }
        return &v1alpha1.EndpointProperties{
-               RawMessage: v1.RawMessage(data),
+               RawMessage: v1alpha1.RawMessage(data),
        }, nil
 }
 
diff --git a/pkg/controller/kameletbinding/error_handler.go 
b/pkg/controller/kameletbinding/error_handler.go
index 48f1639..f7dc600 100644
--- a/pkg/controller/kameletbinding/error_handler.go
+++ b/pkg/controller/kameletbinding/error_handler.go
@@ -21,7 +21,6 @@ import (
        "encoding/json"
        "fmt"
 
-       v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
        "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
        "github.com/apache/camel-k/pkg/util/bindings"
        "github.com/pkg/errors"
@@ -57,8 +56,8 @@ func maybeErrorHandler(errHandlConf 
*v1alpha1.ErrorHandlerSpec, bindingContext b
        return nil, nil
 }
 
-func parseErrorHandler(rawMessage v1.RawMessage) (v1alpha1.ErrorHandler, 
error) {
-       var properties map[v1alpha1.ErrorHandlerType]v1.RawMessage
+func parseErrorHandler(rawMessage v1alpha1.RawMessage) (v1alpha1.ErrorHandler, 
error) {
+       var properties map[v1alpha1.ErrorHandlerType]v1alpha1.RawMessage
        err := json.Unmarshal(rawMessage, &properties)
        if err != nil {
                return nil, err
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 4d6cf4c..a5c1c93 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -257,13 +257,14 @@ func (t *kameletsTrait) addKameletAsSource(e 
*Environment, kamelet *v1alpha1.Kam
        // nolint: staticcheck
        if kamelet.Spec.Template != nil || kamelet.Spec.Flow != nil {
                template := kamelet.Spec.Template
-               //if template == nil {
-               //      // Backward compatibility with Kamelets using flow
-               //      var bytes []byte = kamelet.Spec.Flow.RawMessage
-               //      template = &v1alpha1.Template{
-               //              RawMessage: v1alpha1.RawMessage{bytes},
-               //      }
-               //}
+               if template == nil {
+                       // Backward compatibility with Kamelets using flow
+                       var bytes []byte = kamelet.Spec.Flow.RawMessage
+                       template = &v1alpha1.Template{
+                               RawMessage: make(v1alpha1.RawMessage, 
len(bytes)),
+                       }
+                       copy(template.RawMessage, bytes)
+               }
                flowData, err := dsl.TemplateToYamlDSL(*template, kamelet.Name)
                if err != nil {
                        return err