Skip to content

Commit 1a0c1dd

Browse files
Merge pull request #791 from njhale/fix-back-support
fix(packageserver): add struct tags to PackageManifestList
2 parents 3a4c2b2 + 46b9766 commit 1a0c1dd

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

pkg/package-server/apis/openapi/zz_generated.openapi.go

Lines changed: 15 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/package-server/apis/operators/v1/packagemanifest_types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
// PackageManifestList is a list of PackageManifest objects.
1111
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
1212
type PackageManifestList struct {
13-
metav1.TypeMeta
14-
metav1.ListMeta
13+
metav1.TypeMeta `json:",inline"`
14+
metav1.ListMeta `json:"metadata,omitempty"`
1515

16-
Items []PackageManifest
16+
Items []PackageManifest `json:"items"`
1717
}
1818

1919
// PackageManifest holds information about a package, which is a reference to one (or more)

test/e2e/packagemanifest_e2e_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,10 @@ func TestPackageManifestLoading(t *testing.T) {
108108
require.NotNil(t, pm)
109109
require.Equal(t, packageName, pm.GetName())
110110
require.Equal(t, expectedStatus, pm.Status)
111+
112+
// Get a PackageManifestList and ensure it has the correct items
113+
pmList, err := pmc.OperatorsV1().PackageManifests(testNamespace).List(metav1.ListOptions{})
114+
require.NoError(t, err, "could not access package manifests list meta")
115+
require.NotNil(t, pmList.ListMeta, "package manifest list metadata empty")
116+
require.NotNil(t, pmList.Items)
111117
}

0 commit comments

Comments
 (0)