PC-11300 Fix yamls parsing (#193)

Author: daniel-zelazny

manifest/v1alpha/dataexport/data_export.go

@@ -82,14 +82,17 @@ func (d *Spec) UnmarshalJSON(bytes []byte) error {
 	d.ExportType = genericSpec.ExportType
 	switch d.ExportType {
 	case DataExportTypeS3, DataExportTypeSnowflake:
-		d.Spec = &S3DataExportSpec{}
+		var s3Spec S3DataExportSpec
+		if err := json.Unmarshal(genericSpec.Spec, &s3Spec); err != nil {
+			return err
+		}
+		d.Spec = s3Spec
 	case DataExportTypeGCS:
-		d.Spec = &GCSDataExportSpec{}
-	}
-	if genericSpec.Spec != nil {
-		if err := json.Unmarshal(genericSpec.Spec, &d.Spec); err != nil {
+		var gcsSpec GCSDataExportSpec
+		if err := json.Unmarshal(genericSpec.Spec, &gcsSpec); err != nil {
 			return err
 		}
+		d.Spec = gcsSpec
 	}
 	return nil
 }

manifest/v1alpha/parser/parser.go

@@ -87,16 +87,16 @@ func parseGenericObject(unmarshal unmarshalFunc) (manifest.Object, error) {
 }
 
 func getUnmarshalFunc(data []byte, format manifest.ObjectFormat) (unmarshalFunc, error) {
-	var unmarshal unmarshalFunc
+	jsonUnmarshal := func(v interface{}) error {
+		dec := json.NewDecoder(bytes.NewReader(data))
+		if UseStrictDecodingMode {
+			dec.DisallowUnknownFields()
+		}
+		return dec.Decode(v)
+	}
 	switch format {
 	case manifest.ObjectFormatJSON:
-		unmarshal = func(v interface{}) error {
-			dec := json.NewDecoder(bytes.NewReader(data))
-			if UseStrictDecodingMode {
-				dec.DisallowUnknownFields()
-			}
-			return dec.Decode(v)
-		}
+		return jsonUnmarshal, nil
 	case manifest.ObjectFormatYAML:
 		// Workaround for https://github.com/goccy/go-yaml/issues/313.
 		// If the library changes its interpretation of empty pointer fields,
@@ -106,17 +106,10 @@ func getUnmarshalFunc(data []byte, format manifest.ObjectFormat) (unmarshalFunc,
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to convert YAML to JSON")
 		}
-		var opts []yaml.DecodeOption
-		if UseStrictDecodingMode {
-			opts = append(opts, yaml.Strict())
-		}
-		unmarshal = func(v interface{}) error {
-			return yaml.UnmarshalWithOptions(data, v, opts...)
-		}
+		return jsonUnmarshal, nil
 	default:
 		return nil, errors.Errorf("unsupported format: %s", format)
 	}
-	return unmarshal, nil
 }
 
 func genericParseObject[T manifest.Object](unmarshal unmarshalFunc) (T, error) {

sdk/reader_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/nobl9/nobl9-go/manifest"
+	"github.com/nobl9/nobl9-go/manifest/v1alpha/dataexport"
 )
 
 //go:embed test_data/reader
@@ -143,6 +144,27 @@ func TestReadDefinitions_FromReader(t *testing.T) {
 	})
 }
 
+func TestReadDefinitions_UsingCustomizedUnmarshal(t *testing.T) {
+	t.Run("report an error when unexpected structure was returned", func(t *testing.T) {
+		definitions, err := ReadObjectsFromSources(
+			context.Background(),
+			NewObjectSourceReader(readTestFile(t, "dataexport.yaml"), "stdin"))
+		require.NoError(t, err)
+
+		definitionsMatchExpected(t, definitions, expectedMeta{Name: "dataexport", ManifestSrc: "stdin"})
+
+		require.IsType(t, dataexport.DataExport{}, definitions[0])
+		assert.Equal(
+			t,
+			definitions[0].(dataexport.DataExport).Spec.Spec,
+			dataexport.S3DataExportSpec{
+				BucketName: "example-bucket",
+				RoleARN:    "arn:aws:iam::341861879477:role/n9-access",
+			},
+		)
+	})
+}
+
 func TestReadDefinitions_FromURL(t *testing.T) {
 	t.Run("successful definitions GET for http scheme", func(t *testing.T) {
 		srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -279,6 +301,7 @@ func TestReadDefinitions_FromFS(t *testing.T) {
 		{Name: "service_and_agent", ManifestSrc: workingDir("test_data/reader/inputs/service_and_agent.yaml")},
 		{Name: "projects_and_direct", ManifestSrc: workingDir("test_data/reader/inputs/projects_and_direct.yml")},
 		{Name: "annotations", ManifestSrc: workingDir("test_data/reader/inputs/annotations.yaml")},
+		{Name: "dataexport", ManifestSrc: workingDir("test_data/reader/inputs/dataexport.yaml")},
 		{Name: "project", ManifestSrc: workingDir("test_data/reader/inputs/project.json")},
 	}
 

sdk/test_data/reader/expected/dataexport.tpl.json

@@ -0,0 +1,18 @@
+{
+  "apiVersion": "n9/v1alpha",
+  "kind": "DataExport",
+  "metadata": {
+    "name": "s3-data-export",
+    "displayName": "S3 data export",
+    "project": "default"
+  },
+  "spec": {
+    "exportType": "S3",
+    "spec": {
+      "bucketName": "example-bucket",
+      "roleArn": "arn:aws:iam::341861879477:role/n9-access"
+    }
+  },
+  "status": null,
+  "manifestSrc": "{{ .ManifestSrc }}"
+}

sdk/test_data/reader/inputs/dataexport.yaml

@@ -0,0 +1,11 @@
+apiVersion: n9/v1alpha
+kind: DataExport
+metadata:
+  name: s3-data-export
+  displayName: S3 data export
+  project: default
+spec:
+  exportType: S3
+  spec:
+    bucketName: example-bucket
+    roleArn: arn:aws:iam::341861879477:role/n9-access