internal/api/convert: fix v1alpha1 to v1alpha2

Signed-off-by: Benedikt Bongartz <[email protected]>

Author: frzifus

internal/api/convert/v1alpha.go

@@ -121,6 +121,8 @@ func V1Alpha1to2(in v1alpha1.OpenTelemetryCollector) (v1alpha2.OpenTelemetryColl
 	out.Spec.Mode = v1alpha2.Mode(copy.Spec.Mode)
 	out.Spec.UpgradeStrategy = v1alpha2.UpgradeStrategy(copy.Spec.UpgradeStrategy)
 	out.Spec.Ingress.Type = v1alpha2.IngressType(copy.Spec.Ingress.Type)
+	out.Spec.Ingress.RuleType = v1alpha2.IngressRuleType(copy.Spec.Ingress.RuleType)
+	out.Spec.Ingress.Hostname = copy.Spec.Ingress.Hostname
 	out.Spec.Ingress.Annotations = copy.Spec.Ingress.Annotations
 	out.Spec.Ingress.TLS = copy.Spec.Ingress.TLS
 	out.Spec.Ingress.IngressClassName = copy.Spec.Ingress.IngressClassName

internal/api/convert/v1alpha_test.go

@@ -15,7 +15,6 @@
 package convert
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -24,8 +23,9 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
 )
 
-func Test_V1Alpha1to2_Config(t *testing.T) {
-	config := `---
+func Test_V1Alpha1to2(t *testing.T) {
+	t.Run("valid config", func(t *testing.T) {
+		config := `---
 receivers:
   otlp:
     protocols:
@@ -43,19 +43,29 @@ service:
       processors: [resourcedetection]
       exporters: [otlp]
 `
-	cfgV1 := v1alpha1.OpenTelemetryCollector{
-		Spec: v1alpha1.OpenTelemetryCollectorSpec{
-			Config: config,
-		},
-	}
-
-	cfgV2, err := V1Alpha1to2(cfgV1)
-	assert.Nil(t, err)
-	assert.NotNil(t, cfgV2)
-
-	jsonCfg, err := json.Marshal(&cfgV2.Spec.Config)
-	assert.Nil(t, err)
-	yamlCfg, err := yaml.JSONToYAML(jsonCfg)
-	assert.Nil(t, err)
-	assert.YAMLEq(t, config, string(yamlCfg))
+		cfgV1 := v1alpha1.OpenTelemetryCollector{
+			Spec: v1alpha1.OpenTelemetryCollectorSpec{
+				Config: config,
+			},
+		}
+
+		cfgV2, err := V1Alpha1to2(cfgV1)
+		assert.Nil(t, err)
+		assert.NotNil(t, cfgV2)
+
+		yamlCfg, err := yaml.Marshal(&cfgV2.Spec.Config)
+		assert.Nil(t, err)
+		assert.YAMLEq(t, config, string(yamlCfg))
+	})
+	t.Run("invalid config", func(t *testing.T) {
+		config := `!!!`
+		cfgV1 := v1alpha1.OpenTelemetryCollector{
+			Spec: v1alpha1.OpenTelemetryCollectorSpec{
+				Config: config,
+			},
+		}
+
+		_, err := V1Alpha1to2(cfgV1)
+		assert.ErrorContains(t, err, "could not convert config json to v1alpha2.Config")
+	})
 }