[camel-k] 03/06: tweak other pkg: disable flow>template conversion in kamelet trait

[dj...@apache.org]

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 6d2616909c3830337a590627e644276ff476375b
Author: David Jencks <dj...@apache.org>
AuthorDate: Wed Jan 26 18:01:25 2022 -0800

    tweak other pkg: disable flow>template conversion in kamelet trait
---
 pkg/apis/camel/v1alpha1/error_handler_types.go |  2 --
 pkg/trait/kamelets.go                          | 13 +++++++------
 pkg/util/dsl/template.go                       |  2 +-
 pkg/util/dsl/template_test.go                  |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkg/apis/camel/v1alpha1/error_handler_types.go b/pkg/apis/camel/v1alpha1/error_handler_types.go
index 987f1f7..7f24605 100644
--- a/pkg/apis/camel/v1alpha1/error_handler_types.go
+++ b/pkg/apis/camel/v1alpha1/error_handler_types.go
@@ -19,8 +19,6 @@ package v1alpha1
 
 import (
 	"encoding/json"
-
-	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
 )
 
 // ErrorHandlerRefName --
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 06d2122..4d6cf4c 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -257,12 +257,13 @@ 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
-			template = &v1.Template{
-				RawMessage: kamelet.Spec.Flow.RawMessage,
-			}
-		}
+		//if template == nil {
+		//	// Backward compatibility with Kamelets using flow
+		//	var bytes []byte = kamelet.Spec.Flow.RawMessage
+		//	template = &v1alpha1.Template{
+		//		RawMessage: v1alpha1.RawMessage{bytes},
+		//	}
+		//}
 		flowData, err := dsl.TemplateToYamlDSL(*template, kamelet.Name)
 		if err != nil {
 			return err
diff --git a/pkg/util/dsl/template.go b/pkg/util/dsl/template.go
index 5f83ca3..7862aae 100644
--- a/pkg/util/dsl/template.go
+++ b/pkg/util/dsl/template.go
@@ -23,7 +23,7 @@ import (
 
 	yaml2 "gopkg.in/yaml.v2"
 
-	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+	v1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
 )
 
 // TemplateToYamlDSL converts a kamelet template into its Camel YAML DSL equivalent.
diff --git a/pkg/util/dsl/template_test.go b/pkg/util/dsl/template_test.go
index b2fb016..2098da2 100644
--- a/pkg/util/dsl/template_test.go
+++ b/pkg/util/dsl/template_test.go
@@ -20,7 +20,7 @@ package dsl
 import (
 	"testing"
 
-	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+	v1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
 	"github.com/stretchr/testify/assert"
 )