align function/type names with command structure

joelanford · joelanford · commit b93b3d81cae3 · 2020-07-20T20:17:12.000-04:00
diff --git a/internal/cmd/catalog_add.go b/internal/cmd/catalog_add.go
@@ -13,7 +13,7 @@ import (
 )
 
 func newCatalogAddCmd(cfg *action.Configuration) *cobra.Command {
-	a := action.NewAddCatalog(cfg)
+	a := action.NewCatalogAdd(cfg)
 
 	cmd := &cobra.Command{
 		Use:   "add <name> <index_image>",
diff --git a/internal/cmd/catalog_list.go b/internal/cmd/catalog_list.go
@@ -16,7 +16,7 @@ import (
 
 func newCatalogListCmd(cfg *action.Configuration) *cobra.Command {
 	var allNamespaces bool
-	l := action.NewListCatalogs(cfg)
+	l := action.NewCatalogList(cfg)
 	cmd := &cobra.Command{
 		Use:   "list",
 		Short: "List installed operator catalogs",
diff --git a/internal/cmd/catalog_remove.go b/internal/cmd/catalog_remove.go
@@ -8,7 +8,7 @@ import (
 )
 
 func newCatalogRemoveCmd(cfg *action.Configuration) *cobra.Command {
-	u := action.NewRemoveCatalog(cfg)
+	u := action.NewCatalogRemove(cfg)
 	cmd := &cobra.Command{
 		Use:   "remove <catalog_name>",
 		Short: "Remove a operator catalog",
diff --git a/internal/cmd/operator_install.go b/internal/cmd/operator_install.go
@@ -9,8 +9,8 @@ import (
 	"github.com/joelanford/kubectl-operator/internal/pkg/log"
 )
 
-func newInstallCmd(cfg *action.Configuration) *cobra.Command {
-	i := action.NewInstallOperator(cfg)
+func newOperatorInstallCmd(cfg *action.Configuration) *cobra.Command {
+	i := action.NewOperatorInstall(cfg)
 	cmd := &cobra.Command{
 		Use:   "install <operator>",
 		Short: "Install an operator",
diff --git a/internal/cmd/operator_list.go b/internal/cmd/operator_list.go
@@ -16,9 +16,9 @@ import (
 	"github.com/joelanford/kubectl-operator/internal/pkg/log"
 )
 
-func newListCmd(cfg *action.Configuration) *cobra.Command {
+func newOperatorListCmd(cfg *action.Configuration) *cobra.Command {
 	var allNamespaces bool
-	l := action.NewListOperators(cfg)
+	l := action.NewOperatorList(cfg)
 	cmd := &cobra.Command{
 		Use:   "list",
 		Short: "List installed operators",
diff --git a/internal/cmd/operator_list_available.go b/internal/cmd/operator_list_available.go
@@ -16,8 +16,8 @@ import (
 	"github.com/joelanford/kubectl-operator/internal/pkg/log"
 )
 
-func newListAvailableCmd(cfg *action.Configuration) *cobra.Command {
-	l := action.NewListAvailableOperators(cfg)
+func newOperatorListAvailableCmd(cfg *action.Configuration) *cobra.Command {
+	l := action.NewOperatorListAvailable(cfg)
 	cmd := &cobra.Command{
 		Use:   "list-available",
 		Short: "List operators available to be installed",
diff --git a/internal/cmd/operator_uninstall.go b/internal/cmd/operator_uninstall.go
@@ -7,8 +7,8 @@ import (
 	"github.com/joelanford/kubectl-operator/internal/pkg/log"
 )
 
-func newUninstallCmd(cfg *action.Configuration) *cobra.Command {
-	u := action.NewUninstallOperator(cfg)
+func newOperatorUninstallCmd(cfg *action.Configuration) *cobra.Command {
+	u := action.NewOperatorUninstall(cfg)
 	cmd := &cobra.Command{
 		Use:   "uninstall <operator>",
 		Short: "Uninstall an operator",
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -29,10 +29,10 @@ operators from the installed catalogs.`,
 
 	cmd.AddCommand(
 		newCatalogCmd(&cfg),
-		newInstallCmd(&cfg),
-		newUninstallCmd(&cfg),
-		newListCmd(&cfg),
-		newListAvailableCmd(&cfg),
+		newOperatorInstallCmd(&cfg),
+		newOperatorUninstallCmd(&cfg),
+		newOperatorListCmd(&cfg),
+		newOperatorListAvailableCmd(&cfg),
 	)
 
 	return cmd
diff --git a/internal/pkg/action/catalog_add.go b/internal/pkg/action/catalog_add.go
@@ -17,7 +17,7 @@ import (
 	"github.com/joelanford/kubectl-operator/internal/pkg/log"
 )
 
-type AddCatalog struct {
+type CatalogAdd struct {
 	config *Configuration
 
 	CatalogSourceName string
@@ -32,20 +32,20 @@ type AddCatalog struct {
 	registry *containerdregistry.Registry
 }
 
-func NewAddCatalog(cfg *Configuration) *AddCatalog {
-	return &AddCatalog{
+func NewCatalogAdd(cfg *Configuration) *CatalogAdd {
+	return &CatalogAdd{
 		config: cfg,
 	}
 }
 
-func (a *AddCatalog) BindFlags(fs *pflag.FlagSet) {
+func (a *CatalogAdd) BindFlags(fs *pflag.FlagSet) {
 	fs.StringVarP(&a.DisplayName, "display-name", "d", "", "display name of the index")
 	fs.StringVarP(&a.Publisher, "publisher", "p", "", "publisher of the index")
 	fs.DurationVarP(&a.AddTimeout, "timeout", "t", time.Minute, "the amount of time to wait before cancelling the catalog addition")
 	fs.DurationVar(&a.CleanupTimeout, "cleanup-timeout", time.Minute, "the amount to time to wait before cancelling cleanup")
 }
 
-func (a *AddCatalog) Run(ctx context.Context) (*v1alpha1.CatalogSource, error) {
+func (a *CatalogAdd) Run(ctx context.Context) (*v1alpha1.CatalogSource, error) {
 	var err error
 	a.registry, err = containerdregistry.NewRegistry(a.RegistryOptions...)
 	if err != nil {
@@ -83,7 +83,7 @@ func (a *AddCatalog) Run(ctx context.Context) (*v1alpha1.CatalogSource, error) {
 	return cs, nil
 }
 
-func (a *AddCatalog) labelsFor(ctx context.Context, indexImage string) (map[string]string, error) {
+func (a *CatalogAdd) labelsFor(ctx context.Context, indexImage string) (map[string]string, error) {
 	simpleRef := image.SimpleReference(indexImage)
 	if err := a.registry.Pull(ctx, simpleRef); err != nil {
 		return nil, fmt.Errorf("pull image: %v", err)
@@ -95,7 +95,7 @@ func (a *AddCatalog) labelsFor(ctx context.Context, indexImage string) (map[stri
 	return labels, nil
 }
 
-func (a *AddCatalog) setDefaults(labels map[string]string) {
+func (a *CatalogAdd) setDefaults(labels map[string]string) {
 	if a.DisplayName == "" {
 		if v, ok := labels["operators.operatorframework.io.index.display-name"]; ok {
 			a.DisplayName = v
@@ -108,7 +108,7 @@ func (a *AddCatalog) setDefaults(labels map[string]string) {
 	}
 }
 
-func (a *AddCatalog) add(ctx context.Context, cs *v1alpha1.CatalogSource) error {
+func (a *CatalogAdd) add(ctx context.Context, cs *v1alpha1.CatalogSource) error {
 	if err := a.config.Client.Create(ctx, cs); err != nil {
 		return fmt.Errorf("create catalogsource: %v", err)
 	}
@@ -133,7 +133,7 @@ func (a *AddCatalog) add(ctx context.Context, cs *v1alpha1.CatalogSource) error
 	return nil
 }
 
-func (a *AddCatalog) cleanup(cs *v1alpha1.CatalogSource) {
+func (a *CatalogAdd) cleanup(cs *v1alpha1.CatalogSource) {
 	ctx, cancel := context.WithTimeout(context.Background(), a.CleanupTimeout)
 	defer cancel()
 	if err := a.config.Client.Delete(ctx, cs); err != nil {
diff --git a/internal/pkg/action/catalog_list.go b/internal/pkg/action/catalog_list.go
@@ -7,15 +7,15 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-type ListCatalogs struct {
+type CatalogList struct {
 	config *Configuration
 }
 
-func NewListCatalogs(cfg *Configuration) *ListCatalogs {
-	return &ListCatalogs{cfg}
+func NewCatalogList(cfg *Configuration) *CatalogList {
+	return &CatalogList{cfg}
 }
 
-func (l *ListCatalogs) Run(ctx context.Context) ([]v1alpha1.CatalogSource, error) {
+func (l *CatalogList) Run(ctx context.Context) ([]v1alpha1.CatalogSource, error) {
 	css := v1alpha1.CatalogSourceList{}
 	if err := l.config.Client.List(ctx, &css, client.InNamespace(l.config.Namespace)); err != nil {
 		return nil, err
diff --git a/internal/pkg/action/catalog_remove.go b/internal/pkg/action/catalog_remove.go
@@ -7,19 +7,19 @@ import (
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 )
 
-type RemoveCatalog struct {
+type CatalogRemove struct {
 	config *Configuration
 
 	CatalogName string
 }
 
-func NewRemoveCatalog(cfg *Configuration) *RemoveCatalog {
-	return &RemoveCatalog{
+func NewCatalogRemove(cfg *Configuration) *CatalogRemove {
+	return &CatalogRemove{
 		config: cfg,
 	}
 }
 
-func (r *RemoveCatalog) Run(ctx context.Context) error {
+func (r *CatalogRemove) Run(ctx context.Context) error {
 	cs := v1alpha1.CatalogSource{}
 	cs.SetNamespace(r.config.Namespace)
 	cs.SetName(r.CatalogName)
diff --git a/internal/pkg/action/operator_install.go b/internal/pkg/action/operator_install.go
@@ -20,7 +20,7 @@ import (
 	"github.com/joelanford/kubectl-operator/internal/pkg/subscription"
 )
 
-type InstallOperator struct {
+type OperatorInstall struct {
 	config *Configuration
 
 	Package             string
@@ -32,13 +32,13 @@ type InstallOperator struct {
 	CreateOperatorGroup bool
 }
 
-func NewInstallOperator(cfg *Configuration) *InstallOperator {
-	return &InstallOperator{
+func NewOperatorInstall(cfg *Configuration) *OperatorInstall {
+	return &OperatorInstall{
 		config: cfg,
 	}
 }
 
-func (i *InstallOperator) BindFlags(fs *pflag.FlagSet) {
+func (i *OperatorInstall) BindFlags(fs *pflag.FlagSet) {
 	fs.StringVarP(&i.Channel, "channel", "c", "", "subscription channel")
 	fs.StringVarP(&i.Approve, "approval", "a", "", "approval (Automatic or Manual)")
 	fs.DurationVarP(&i.InstallTimeout, "timeout", "t", time.Minute, "the amount of time to wait before cancelling the install")
@@ -48,7 +48,7 @@ func (i *InstallOperator) BindFlags(fs *pflag.FlagSet) {
 	fs.VarP(imVal, "install-mode", "i", "install mode")
 }
 
-func (i *InstallOperator) Run(ctx context.Context) (*v1alpha1.ClusterServiceVersion, error) {
+func (i *OperatorInstall) Run(ctx context.Context) (*v1alpha1.ClusterServiceVersion, error) {
 	og, err := i.getOperatorGroup(ctx)
 	if err != nil {
 		return nil, err
@@ -126,7 +126,7 @@ func (i *InstallOperator) Run(ctx context.Context) (*v1alpha1.ClusterServiceVers
 	return csv, nil
 }
 
-func (i InstallOperator) getOperatorGroup(ctx context.Context) (*v1.OperatorGroup, error) {
+func (i OperatorInstall) getOperatorGroup(ctx context.Context) (*v1.OperatorGroup, error) {
 	ogs := &v1.OperatorGroupList{}
 	err := i.config.Client.List(ctx, ogs, client.InNamespace(i.config.Namespace))
 	if err != nil {
@@ -143,7 +143,7 @@ func (i InstallOperator) getOperatorGroup(ctx context.Context) (*v1.OperatorGrou
 	}
 }
 
-func (i *InstallOperator) getPackageManifest(ctx context.Context) (*operatorsv1.PackageManifest, error) {
+func (i *OperatorInstall) getPackageManifest(ctx context.Context) (*operatorsv1.PackageManifest, error) {
 	pm := &operatorsv1.PackageManifest{}
 	key := types.NamespacedName{
 		Namespace: i.config.Namespace,
@@ -155,7 +155,7 @@ func (i *InstallOperator) getPackageManifest(ctx context.Context) (*operatorsv1.
 	return pm, nil
 }
 
-func (i *InstallOperator) createOperatorGroup(ctx context.Context, supported sets.String) (*v1.OperatorGroup, error) {
+func (i *OperatorInstall) createOperatorGroup(ctx context.Context, supported sets.String) (*v1.OperatorGroup, error) {
 	og := &v1.OperatorGroup{}
 	og.SetName(i.config.Namespace)
 	og.SetNamespace(i.config.Namespace)
@@ -177,7 +177,7 @@ func (i *InstallOperator) createOperatorGroup(ctx context.Context, supported set
 	return og, nil
 }
 
-func (i *InstallOperator) validateOperatorGroup(og v1.OperatorGroup, supported sets.String) error {
+func (i *OperatorInstall) validateOperatorGroup(og v1.OperatorGroup, supported sets.String) error {
 	ogTargetNs := sets.NewString(og.Spec.TargetNamespaces...)
 	imTargetNs := sets.NewString(i.InstallMode.TargetNamespaces...)
 	ownNamespaceNs := sets.NewString(i.config.Namespace)
@@ -209,7 +209,7 @@ func getSupportedInstallModes(csvInstallModes []v1alpha1.InstallMode) sets.Strin
 	return supported
 }
 
-func (i *InstallOperator) getPackageChannel(pm *operatorsv1.PackageManifest) (*operatorsv1.PackageChannel, error) {
+func (i *OperatorInstall) getPackageChannel(pm *operatorsv1.PackageManifest) (*operatorsv1.PackageChannel, error) {
 	if i.Channel == "" {
 		i.Channel = pm.Status.DefaultChannel
 	}
@@ -225,7 +225,7 @@ func (i *InstallOperator) getPackageChannel(pm *operatorsv1.PackageManifest) (*o
 	return packageChannel, nil
 }
 
-func (i *InstallOperator) cleanup(ctx context.Context, sub *v1alpha1.Subscription) {
+func (i *OperatorInstall) cleanup(ctx context.Context, sub *v1alpha1.Subscription) {
 	if err := i.config.Client.Delete(ctx, sub); err != nil {
 		log.Printf("delete subscription %q: %v", sub.Name, err)
 	}
diff --git a/internal/pkg/action/operator_list.go b/internal/pkg/action/operator_list.go
@@ -6,15 +6,15 @@ import (
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 )
 
-type ListOperators struct {
+type OperatorList struct {
 	config *Configuration
 }
 
-func NewListOperators(cfg *Configuration) *ListOperators {
-	return &ListOperators{cfg}
+func NewOperatorList(cfg *Configuration) *OperatorList {
+	return &OperatorList{cfg}
 }
 
-func (l *ListOperators) Run(ctx context.Context) ([]v1alpha1.Subscription, error) {
+func (l *OperatorList) Run(ctx context.Context) ([]v1alpha1.Subscription, error) {
 	subs := v1alpha1.SubscriptionList{}
 	if err := l.config.Client.List(ctx, &subs); err != nil {
 		return nil, err
diff --git a/internal/pkg/action/operator_list_available.go b/internal/pkg/action/operator_list_available.go
@@ -11,19 +11,19 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-type ListAvailableOperators struct {
+type OperatorListAvailable struct {
 	config *Configuration
 
 	Catalog NamespacedName
 }
 
-func NewListAvailableOperators(cfg *Configuration) *ListAvailableOperators {
-	return &ListAvailableOperators{
+func NewOperatorListAvailable(cfg *Configuration) *OperatorListAvailable {
+	return &OperatorListAvailable{
 		config: cfg,
 	}
 }
 
-func (l *ListAvailableOperators) Run(ctx context.Context) ([]v1.PackageManifest, error) {
+func (l *OperatorListAvailable) Run(ctx context.Context) ([]v1.PackageManifest, error) {
 	pms := v1.PackageManifestList{}
 
 	labelSelector := client.MatchingLabels{}
@@ -39,7 +39,7 @@ func (l *ListAvailableOperators) Run(ctx context.Context) ([]v1.PackageManifest,
 	return pms.Items, nil
 }
 
-func (l *ListAvailableOperators) BindFlags(fs *pflag.FlagSet) {
+func (l *OperatorListAvailable) BindFlags(fs *pflag.FlagSet) {
 	fs.VarP(&l.Catalog, "catalog", "c", "catalog to query (default: search all cluster catalogs)")
 }
 
diff --git a/internal/pkg/action/operator_uninstall.go b/internal/pkg/action/operator_uninstall.go
@@ -15,26 +15,26 @@ import (
 	"github.com/joelanford/kubectl-operator/internal/pkg/log"
 )
 
-type UninstallOperator struct {
+type OperatorUninstall struct {
 	config *Configuration
 
 	Package             string
 	DeleteOperatorGroup bool
 	DeleteCRDs          bool
 }
 
-func NewUninstallOperator(cfg *Configuration) *UninstallOperator {
-	return &UninstallOperator{
+func NewOperatorUninstall(cfg *Configuration) *OperatorUninstall {
+	return &OperatorUninstall{
 		config: cfg,
 	}
 }
 
-func (u *UninstallOperator) BindFlags(fs *pflag.FlagSet) {
+func (u *OperatorUninstall) BindFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&u.DeleteOperatorGroup, "delete-operator-group", false, "delete operator group if no other operators remain")
 	fs.BoolVar(&u.DeleteCRDs, "delete-crds", false, "delete all owned CRDs and all CRs")
 }
 
-func (u *UninstallOperator) Run(ctx context.Context) error {
+func (u *OperatorUninstall) Run(ctx context.Context) error {
 	subs := v1alpha1.SubscriptionList{}
 	if err := u.config.Client.List(ctx, &subs, client.InNamespace(u.config.Namespace)); err != nil {
 		return fmt.Errorf("list subscriptions: %v", err)
@@ -87,7 +87,7 @@ func (u *UninstallOperator) Run(ctx context.Context) error {
 	return nil
 }
 
-func (u *UninstallOperator) deleteCSVandCRDs(ctx context.Context, csvName string, ignoreNotFound bool) error {
+func (u *OperatorUninstall) deleteCSVandCRDs(ctx context.Context, csvName string, ignoreNotFound bool) error {
 	csvKey := types.NamespacedName{
 		Name:      csvName,
 		Namespace: u.config.Namespace,

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func newCatalogAddCmd(cfg action.Configuration) cobra.Command {`
`16`		`- a := action.NewAddCatalog(cfg)`
	`16`	`+ a := action.NewCatalogAdd(cfg)`
`17`	`17`
`18`	`18`	`cmd := &cobra.Command{`
`19`	`19`	`Use: "add <name> <index_image>",`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func newCatalogRemoveCmd(cfg action.Configuration) cobra.Command {`
`11`		`- u := action.NewRemoveCatalog(cfg)`
	`11`	`+ u := action.NewCatalogRemove(cfg)`
`12`	`12`	`cmd := &cobra.Command{`
`13`	`13`	`Use: "remove <catalog_name>",`
`14`	`14`	`Short: "Remove a operator catalog",`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"github.com/joelanford/kubectl-operator/internal/pkg/log"`
`18`	`18`	`)`
`19`	`19`
`20`		`-type AddCatalog struct {`
	`20`	`+type CatalogAdd struct {`
`21`	`21`	`config *Configuration`
`22`	`22`
`23`	`23`	`CatalogSourceName string`
`@@ -32,20 +32,20 @@ type AddCatalog struct {`
`32`	`32`	`registry *containerdregistry.Registry`
`33`	`33`	`}`
`34`	`34`
`35`		`-func NewAddCatalog(cfg Configuration) AddCatalog {`
`36`		`- return &AddCatalog{`
	`35`	`+func NewCatalogAdd(cfg Configuration) CatalogAdd {`
	`36`	`+ return &CatalogAdd{`
`37`	`37`	`config: cfg,`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`-func (a AddCatalog) BindFlags(fs pflag.FlagSet) {`
	`41`	`+func (a CatalogAdd) BindFlags(fs pflag.FlagSet) {`
`42`	`42`	`fs.StringVarP(&a.DisplayName, "display-name", "d", "", "display name of the index")`
`43`	`43`	`fs.StringVarP(&a.Publisher, "publisher", "p", "", "publisher of the index")`
`44`	`44`	`fs.DurationVarP(&a.AddTimeout, "timeout", "t", time.Minute, "the amount of time to wait before cancelling the catalog addition")`
`45`	`45`	`fs.DurationVar(&a.CleanupTimeout, "cleanup-timeout", time.Minute, "the amount to time to wait before cancelling cleanup")`
`46`	`46`	`}`
`47`	`47`
`48`		`-func (a AddCatalog) Run(ctx context.Context) (v1alpha1.CatalogSource, error) {`
	`48`	`+func (a CatalogAdd) Run(ctx context.Context) (v1alpha1.CatalogSource, error) {`
`49`	`49`	`var err error`
`50`	`50`	`a.registry, err = containerdregistry.NewRegistry(a.RegistryOptions...)`
`51`	`51`	`if err != nil {`
`@@ -83,7 +83,7 @@ func (a AddCatalog) Run(ctx context.Context) (v1alpha1.CatalogSource, error) {`
`83`	`83`	`return cs, nil`
`84`	`84`	`}`
`85`	`85`
`86`		`-func (a *AddCatalog) labelsFor(ctx context.Context, indexImage string) (map[string]string, error) {`
	`86`	`+func (a *CatalogAdd) labelsFor(ctx context.Context, indexImage string) (map[string]string, error) {`
`87`	`87`	`simpleRef := image.SimpleReference(indexImage)`
`88`	`88`	`if err := a.registry.Pull(ctx, simpleRef); err != nil {`
`89`	`89`	`return nil, fmt.Errorf("pull image: %v", err)`
`@@ -95,7 +95,7 @@ func (a *AddCatalog) labelsFor(ctx context.Context, indexImage string) (map[stri`
`95`	`95`	`return labels, nil`
`96`	`96`	`}`
`97`	`97`
`98`		`-func (a *AddCatalog) setDefaults(labels map[string]string) {`
	`98`	`+func (a *CatalogAdd) setDefaults(labels map[string]string) {`
`99`	`99`	`if a.DisplayName == "" {`
`100`	`100`	`if v, ok := labels["operators.operatorframework.io.index.display-name"]; ok {`
`101`	`101`	`a.DisplayName = v`
`@@ -108,7 +108,7 @@ func (a *AddCatalog) setDefaults(labels map[string]string) {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`-func (a AddCatalog) add(ctx context.Context, cs v1alpha1.CatalogSource) error {`
	`111`	`+func (a CatalogAdd) add(ctx context.Context, cs v1alpha1.CatalogSource) error {`
`112`	`112`	`if err := a.config.Client.Create(ctx, cs); err != nil {`
`113`	`113`	`return fmt.Errorf("create catalogsource: %v", err)`
`114`	`114`	`}`
`@@ -133,7 +133,7 @@ func (a AddCatalog) add(ctx context.Context, cs v1alpha1.CatalogSource) error`
`133`	`133`	`return nil`
`134`	`134`	`}`
`135`	`135`
`136`		`-func (a AddCatalog) cleanup(cs v1alpha1.CatalogSource) {`
	`136`	`+func (a CatalogAdd) cleanup(cs v1alpha1.CatalogSource) {`
`137`	`137`	`ctx, cancel := context.WithTimeout(context.Background(), a.CleanupTimeout)`
`138`	`138`	`defer cancel()`
`139`	`139`	`if err := a.config.Client.Delete(ctx, cs); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@ import (`
`7`	`7`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`8`	`8`	`)`
`9`	`9`
`10`		`-type ListCatalogs struct {`
	`10`	`+type CatalogList struct {`
`11`	`11`	`config *Configuration`
`12`	`12`	`}`
`13`	`13`
`14`		`-func NewListCatalogs(cfg Configuration) ListCatalogs {`
`15`		`- return &ListCatalogs{cfg}`
	`14`	`+func NewCatalogList(cfg Configuration) CatalogList {`
	`15`	`+ return &CatalogList{cfg}`
`16`	`16`	`}`
`17`	`17`
`18`		`-func (l *ListCatalogs) Run(ctx context.Context) ([]v1alpha1.CatalogSource, error) {`
	`18`	`+func (l *CatalogList) Run(ctx context.Context) ([]v1alpha1.CatalogSource, error) {`
`19`	`19`	`css := v1alpha1.CatalogSourceList{}`
`20`	`20`	`if err := l.config.Client.List(ctx, &css, client.InNamespace(l.config.Namespace)); err != nil {`
`21`	`21`	`return nil, err`