switching maintainer back to 0.5.0 release and adding marshaling tests (

#749) Switching maintainer back to 0.5.0 release and adding marshaling tests
kudobuilder · Sep 4, 2019 · 79a2f56 · 79a2f56
1 parent f6081b9
commit 79a2f56
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 8 deletions.
diff --git a/pkg/bundle/operator.go b/pkg/bundle/operator.go
@@ -2,6 +2,8 @@ package bundle
 
 import "github.com/kudobuilder/kudo/pkg/apis/kudo/v1alpha1"
 
+//TODO (kensipe): Switch Maintainers to Repo Maintainer: https://github.com/kudobuilder/kudo/blob/master/pkg/kudoctl/util/repo/repo.go#L43
+
 // Operator is a representation of the KEP-9 Operator YAML
 type Operator struct {
 	Name              string                        `json:"name"`

diff --git a/pkg/kudoctl/util/repo/index.go b/pkg/kudoctl/util/repo/index.go
@@ -180,12 +180,18 @@ func ToPackageVersion(pf *bundle.PackageFiles, digest string, url string) *Packa
 		url = url + "/"
 	}
 	url = fmt.Sprintf("%s%s-%v.tgz", url, o.Name, o.Version)
+	m := make([]*Maintainer, len(o.Maintainers))
+	for i, maintainer := range o.Maintainers {
+		m[i] = &Maintainer{
+			Name: string(maintainer),
+		}
+	}
 	pv := PackageVersion{
 		Metadata: &Metadata{
 			Name:        o.Name,
 			Version:     o.Version,
 			Description: o.Description,
-			Maintainers: o.Maintainers,
+			Maintainers: m,
 			AppVersion:  o.AppVersion,
 		},
 		URLs:   []string{url},

diff --git a/pkg/kudoctl/util/repo/index_test.go b/pkg/kudoctl/util/repo/index_test.go
@@ -52,6 +52,23 @@ entries:
 	assert.Equal(t, index.Entries["flink"][0].AppVersion, "1.7.2", "flink app version")
 }
 
+// TestParsingGoldenIndex and parses the index file catching marshalling issues.
+func TestParsingGoldenIndex(t *testing.T) {
+
+	file := "flink-index.yaml"
+
+	gp := filepath.Join("testdata", file+".golden")
+
+	g, err := ioutil.ReadFile(gp)
+	if err != nil {
+		t.Fatalf("failed reading .golden: %s", err)
+	}
+	_, err = parseIndexFile(g)
+	if err != nil {
+		t.Fatalf("Unable to parse Index file %s", err)
+	}
+}
+
 func TestWriteIndexFile(t *testing.T) {
 	file := "flink-index.yaml"
 	// Given Index with an operator
@@ -94,11 +111,21 @@ func getTestBundleVersion(name string, version string) PackageVersion {
 	urls := []string{fmt.Sprintf("http://kudo.dev/%v", name)}
 	bv := PackageVersion{
 		Metadata: &Metadata{
-			Name:       name,
-			Version:    version,
-			AppVersion: "0.7.0",
+			Name:        name,
+			Version:     version,
+			AppVersion:  "0.7.0",
+			Home:        "kudo.dev",
+			Sources:     []string{"https://github.com/kudobuilder/kudo"},
+			Description: "fancy description is here",
+			Deprecated:  false,
+			Maintainers: []*Maintainer{
+				&Maintainer{Name: "Fabian Baier", Email: "<fabian@mesosphere.io>"},
+				&Maintainer{Name: "Tom Runyon", Email: "<runyontr@gmail.com>"},
+				&Maintainer{Name: "Ken Sipe", Email: "<kensipe@gmail.com>"}},
 		},
-		URLs: urls,
+		URLs:    urls,
+		Removed: false,
+		Digest:  "0787a078e64c73064287751b833d63ca3d1d284b4f494ebf670443683d5b96dd",
 	}
 	return bv
 }

diff --git a/pkg/kudoctl/util/repo/repo.go b/pkg/kudoctl/util/repo/repo.go
@@ -1,7 +1,5 @@
 package repo
 
-import "github.com/kudobuilder/kudo/pkg/apis/kudo/v1alpha1"
-
 // RepositoryConfiguration represents a collection of parameters for operator repository.
 type RepositoryConfiguration struct {
 	URL string `json:"url"`
@@ -33,7 +31,7 @@ type Metadata struct {
 	Description string `json:"description,omitempty"`
 
 	// Maintainers is a list of name and URL/email addresses of the maintainer(s).
-	Maintainers []v1alpha1.Maintainer `json:"maintainers,omitempty"`
+	Maintainers []*Maintainer `json:"maintainers,omitempty"`
 
 	// Deprecated reflects whether this operator is deprecated.
 	Deprecated bool `json:"deprecated,omitempty"`

diff --git a/pkg/kudoctl/util/repo/testdata/flink-index.yaml.golden b/pkg/kudoctl/util/repo/testdata/flink-index.yaml.golden
@@ -2,7 +2,19 @@ apiVersion: v1
 entries:
   flink:
   - appVersion: 0.7.0
+    description: fancy description is here
+    digest: 0787a078e64c73064287751b833d63ca3d1d284b4f494ebf670443683d5b96dd
+    home: kudo.dev
+    maintainers:
+    - email: <fabian@mesosphere.io>
+      name: Fabian Baier
+    - email: <runyontr@gmail.com>
+      name: Tom Runyon
+    - email: <kensipe@gmail.com>
+      name: Ken Sipe
     name: flink
+    sources:
+    - https://github.com/kudobuilder/kudo
     urls:
     - http://kudo.dev/flink
     version: 0.3.0