Merge pull request #1002 from alecmerdler/bugzilla-1727800

openshift-merge-robot · web-flow · commit 55d504a1de95 · 2019-08-22T19:00:45.000+02:00
Bug 1727800: Remove Icon from `PackageManifest` Resource
diff --git a/pkg/package-server/storage/reststorage.go b/pkg/package-server/storage/reststorage.go
@@ -85,6 +85,12 @@ func (m *PackageManifestStorage) List(ctx context.Context, options *metainternal
 			filtered = append(filtered, manifest)
 		}
 	}
+	// Strip logo icons
+	for i := range filtered {
+		for j := range filtered[i].Status.Channels {
+			filtered[i].Status.Channels[j].CurrentCSVDesc.Icon = []operators.Icon{}
+		}
+	}
 	res.Items = filtered
 
 	return res, nil
@@ -97,6 +103,10 @@ func (m *PackageManifestStorage) Get(ctx context.Context, name string, opts *met
 	if err != nil || manifest == nil {
 		return nil, k8serrors.NewNotFound(m.groupResource, name)
 	}
+	// Strip logo icons
+	for i := range manifest.Status.Channels {
+		manifest.Status.Channels[i].CurrentCSVDesc.Icon = []operators.Icon{}
+	}
 
 	return manifest, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,12 @@ func (m PackageManifestStorage) List(ctx context.Context, options metainternal`
`85`	`85`	`filtered = append(filtered, manifest)`
`86`	`86`	`}`
`87`	`87`	`}`
	`88`	`+ // Strip logo icons`
	`89`	`+ for i := range filtered {`
	`90`	`+ for j := range filtered[i].Status.Channels {`
	`91`	`+ filtered[i].Status.Channels[j].CurrentCSVDesc.Icon = []operators.Icon{}`
	`92`	`+ }`
	`93`	`+ }`
`88`	`94`	`res.Items = filtered`
`89`	`95`
`90`	`96`	`return res, nil`
`@@ -97,6 +103,10 @@ func (m PackageManifestStorage) Get(ctx context.Context, name string, opts met`
`97`	`103`	`if err != nil \|\| manifest == nil {`
`98`	`104`	`return nil, k8serrors.NewNotFound(m.groupResource, name)`
`99`	`105`	`}`
	`106`	`+ // Strip logo icons`
	`107`	`+ for i := range manifest.Status.Channels {`
	`108`	`+ manifest.Status.Channels[i].CurrentCSVDesc.Icon = []operators.Icon{}`
	`109`	`+ }`
`100`	`110`
`101`	`111`	`return manifest, nil`
`102`	`112`	`}`