fix: Spec unmarshalling now supports defaults and validation

specs/destination.go

@@ -30,9 +30,6 @@ func (d *Destination) SetDefaults() {
 	if d.Path == "" {
 		d.Path = d.Name
 	}
-	if d.Version == "" {
-		d.Version = "latest"
-	}
 	if d.Registry == RegistryGithub && !strings.Contains(d.Path, "/") {
 		d.Path = "cloudquery/" + d.Path
 	}
@@ -43,10 +40,23 @@ func (d *Destination) UnmarshalSpec(out interface{}) error {
 	if err != nil {
 		return err
 	}
-	dec := json.NewDecoder(nil)
+	dec := json.NewDecoder(bytes.NewReader(b))
 	dec.UseNumber()
 	dec.DisallowUnknownFields()
-	return json.Unmarshal(b, out)
+	return dec.Decode(out)
+}
+
+func (d *Destination) Validate() error {
+	if d.Name == "" {
+		return fmt.Errorf("name is required")
+	}
+	if d.Version == "" {
+		return fmt.Errorf("version is required")
+	}
+	if !strings.HasPrefix(d.Version, "v") {
+		return fmt.Errorf("version must start with v")
+	}
+	return nil
 }
 
 func (m WriteMode) String() string {

specs/destination_test.go

@@ -2,6 +2,8 @@ package specs
 
 import (
 	"testing"
+
+	"github.com/google/go-cmp/cmp"
 )
 
 type testDestinationSpec struct {
@@ -24,23 +26,7 @@ func TestWriteModeFromString(t *testing.T) {
 	}
 }
 
-func TestDestinationSetDefaults(t *testing.T) {
-	destination := Destination{
-		Name: "testDestination",
-	}
-	destination.SetDefaults()
-	if destination.Registry != RegistryGithub {
-		t.Fatalf("expected RegistryGithub, got %v", destination.Registry)
-	}
-	if destination.Path != "cloudquery/testDestination" {
-		t.Fatalf("expected destination.Path (%s), got %s", destination.Name, destination.Path)
-	}
-	if destination.Version != "latest" {
-		t.Fatalf("expected latest, got %s", destination.Version)
-	}
-}
-
-func TestDestinationUnmarshalSpec(t *testing.T) {
+func TestDestinationSpecUnmarshalSpec(t *testing.T) {
 	destination := Destination{
 		Spec: map[string]interface{}{
 			"connection_string": "postgres://user:pass@host:port/db",
@@ -54,3 +40,137 @@ func TestDestinationUnmarshalSpec(t *testing.T) {
 		t.Fatalf("expected postgres://user:pass@host:port/db, got %s", spec.ConnectionString)
 	}
 }
+
+var destinationUnmarshalSpecTestCases = []struct {
+	name   string
+	spec   string
+	err    string
+	source *Source
+}{
+	{
+		"invalid_kind",
+		`kind: nice`,
+		"failed to decode spec: unknown kind nice",
+		nil,
+	},
+	{
+		"invalid_type",
+		`kind: source
+spec:
+  name: 3
+`,
+		"failed to decode spec: json: cannot unmarshal number into Go struct field Source.name of type string",
+		&Source{
+			Name:   "test",
+			Tables: []string{"*"},
+		},
+	},
+	{
+		"unknown_field",
+		`kind: source
+spec:
+  namea: 3
+`,
+		`failed to decode spec: json: unknown field "namea"`,
+		&Source{
+			Name:   "test",
+			Tables: []string{"*"},
+		},
+	},
+}
+
+func TestDestinationUnmarshalSpec(t *testing.T) {
+	for _, tc := range destinationUnmarshalSpecTestCases {
+		t.Run(tc.name, func(t *testing.T) {
+			var err error
+			var spec Spec
+			err = SpecUnmarshalYamlStrict([]byte(tc.spec), &spec)
+			if err != nil {
+				if err.Error() != tc.err {
+					t.Fatalf("expected:%s got:%s", tc.err, err.Error())
+				}
+				return
+			}
+
+			source := spec.Spec.(*Source)
+			if cmp.Diff(source, tc.source) != "" {
+				t.Fatalf("expected:%v got:%v", tc.source, source)
+			}
+		})
+	}
+}
+
+var destinationUnmarshalSpecValidateTestCases = []struct {
+	name        string
+	spec        string
+	err         string
+	destination *Destination
+}{
+	{
+		"required_name",
+		`kind: destination
+spec:`,
+		"name is required",
+		nil,
+	},
+	{
+		"required_version",
+		`kind: destination
+spec:
+  name: test
+`,
+		"version is required",
+		nil,
+	},
+	{
+		"required_version_format",
+		`kind: destination
+spec:
+  name: test
+  version: 1.1.0
+`,
+		"version must start with v",
+		nil,
+	},
+	{
+		"success",
+		`kind: destination
+spec:
+  name: test
+  version: v1.1.0
+`,
+		"",
+		&Destination{
+			Name:     "test",
+			Registry: RegistryGithub,
+			Path:     "cloudquery/test",
+			Version:  "v1.1.0",
+		},
+	},
+}
+
+func TestDestinationUnmarshalSpecValidate(t *testing.T) {
+	for _, tc := range destinationUnmarshalSpecValidateTestCases {
+		t.Run(tc.name, func(t *testing.T) {
+			var err error
+			var spec Spec
+			err = SpecUnmarshalYamlStrict([]byte(tc.spec), &spec)
+			if err != nil {
+				t.Fatal(err)
+			}
+			destination := spec.Spec.(*Destination)
+			destination.SetDefaults()
+			err = destination.Validate()
+			if err != nil {
+				if err.Error() != tc.err {
+					t.Fatalf("expected:%s got:%s", tc.err, err.Error())
+				}
+				return
+			}
+
+			if cmp.Diff(destination, tc.destination) != "" {
+				t.Fatalf("expected:%v got:%v", tc.destination, destination)
+			}
+		})
+	}
+}

specs/source.go

@@ -1,10 +1,10 @@
 package specs
 
 import (
+	"bytes"
 	"encoding/json"
+	"fmt"
 	"strings"
-
-	"github.com/xeipuuv/gojsonschema"
 )
 
 // Source is the spec for a source plugin
@@ -40,12 +40,12 @@ func (s *Source) SetDefaults() {
 	if s.Path == "" {
 		s.Path = s.Name
 	}
-	if s.Version == "" {
-		s.Version = "latest"
-	}
 	if s.Registry == RegistryGithub && !strings.Contains(s.Path, "/") {
 		s.Path = "cloudquery/" + s.Path
 	}
+	if s.Tables == nil {
+		s.Tables = []string{"*"}
+	}
 }
 
 // UnmarshalSpec unmarshals the internal spec into the given interface
@@ -54,12 +54,24 @@ func (s *Source) UnmarshalSpec(out interface{}) error {
 	if err != nil {
 		return err
 	}
-	dec := json.NewDecoder(nil)
+	dec := json.NewDecoder(bytes.NewReader(b))
 	dec.UseNumber()
 	dec.DisallowUnknownFields()
-	return json.Unmarshal(b, out)
+	return dec.Decode(out)
 }
 
-func (*Source) Validate() (*gojsonschema.Result, error) {
-	return nil, nil
+func (s *Source) Validate() error {
+	if s.Name == "" {
+		return fmt.Errorf("name is required")
+	}
+	if s.Version == "" {
+		return fmt.Errorf("version is required")
+	}
+	if !strings.HasPrefix(s.Version, "v") {
+		return fmt.Errorf("version must start with v")
+	}
+	if len(s.Destinations) == 0 {
+		return fmt.Errorf("at least one destination is required")
+	}
+	return nil
 }