Merge pull request #1078 from awgreene/update-package-table

openshift-merge-robot · web-flow · commit 36db20063dd3 · 2019-10-20T01:27:46.000+02:00
Bug 1761924:  Update PackageManifest table handler
diff --git a/pkg/package-server/storage/printer.go b/pkg/package-server/storage/printer.go
@@ -33,15 +33,15 @@ func addTableHandlers(h printers.PrintHandler) {
 
 }
 
-func printPackage(manifest *operators.PackageManifest, options printers.PrintOptions) ([]metav1beta1.TableRow, error) {
+func printPackage(manifest *operators.PackageManifest, options printers.GenerateOptions) ([]metav1beta1.TableRow, error) {
 	row := metav1beta1.TableRow{
 		Object: runtime.RawExtension{Object: manifest},
 	}
 	row.Cells = append(row.Cells, manifest.Name, manifest.Status.CatalogSourceDisplayName, translateTimestampSince(manifest.CreationTimestamp))
 	return []metav1beta1.TableRow{row}, nil
 }
 
-func printPackageList(manifestList *operators.PackageManifestList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) {
+func printPackageList(manifestList *operators.PackageManifestList, options printers.GenerateOptions) ([]metav1beta1.TableRow, error) {
 	rows := make([]metav1beta1.TableRow, 0, len(manifestList.Items))
 	for i := range manifestList.Items {
 		r, err := printPackage(&manifestList.Items[i], options)

Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,15 @@ func addTableHandlers(h printers.PrintHandler) {`
`33`	`33`
`34`	`34`	`}`
`35`	`35`
`36`		`-func printPackage(manifest *operators.PackageManifest, options printers.PrintOptions) ([]metav1beta1.TableRow, error) {`
	`36`	`+func printPackage(manifest *operators.PackageManifest, options printers.GenerateOptions) ([]metav1beta1.TableRow, error) {`
`37`	`37`	`row := metav1beta1.TableRow{`
`38`	`38`	`Object: runtime.RawExtension{Object: manifest},`
`39`	`39`	`}`
`40`	`40`	`row.Cells = append(row.Cells, manifest.Name, manifest.Status.CatalogSourceDisplayName, translateTimestampSince(manifest.CreationTimestamp))`
`41`	`41`	`return []metav1beta1.TableRow{row}, nil`
`42`	`42`	`}`
`43`	`43`
`44`		`-func printPackageList(manifestList *operators.PackageManifestList, options printers.PrintOptions) ([]metav1beta1.TableRow, error) {`
	`44`	`+func printPackageList(manifestList *operators.PackageManifestList, options printers.GenerateOptions) ([]metav1beta1.TableRow, error) {`
`45`	`45`	`rows := make([]metav1beta1.TableRow, 0, len(manifestList.Items))`
`46`	`46`	`for i := range manifestList.Items {`
`47`	`47`	`r, err := printPackage(&manifestList.Items[i], options)`