Revert "Fix failing integration tests for multi-registry functionality (#1740)" (#1741)

This reverts commit 18c37e6.

Author: SSharma-10

commands/command_config.go

@@ -74,7 +74,6 @@ type CmdConfig struct {
 	Kubernetes         func() do.KubernetesService
 	Databases          func() do.DatabasesService
 	Registry           func() do.RegistryService
-	Registries         func() do.RegistriesService
 	VPCs               func() do.VPCsService
 	OneClicks          func() do.OneClickService
 	Apps               func() do.AppsService
@@ -134,7 +133,6 @@ func NewCmdConfig(ns string, dc doctl.Config, out io.Writer, args []string, init
 			c.Kubernetes = func() do.KubernetesService { return do.NewKubernetesService(godoClient) }
 			c.Databases = func() do.DatabasesService { return do.NewDatabasesService(godoClient) }
 			c.Registry = func() do.RegistryService { return do.NewRegistryService(godoClient) }
-			c.Registries = func() do.RegistriesService { return do.NewRegistriesService(godoClient) }
 			c.VPCs = func() do.VPCsService { return do.NewVPCsService(godoClient) }
 			c.OneClicks = func() do.OneClickService { return do.NewOneClickService(godoClient) }
 			c.Apps = func() do.AppsService { return do.NewAppsService(godoClient) }

commands/commands_test.go

@@ -276,7 +276,6 @@ type tcMocks struct {
 	projects              *domocks.MockProjectsService
 	kubernetes            *domocks.MockKubernetesService
 	registry              *domocks.MockRegistryService
-	registries            *domocks.MockRegistriesService
 	sshRunner             *domocks.MockRunner
 	vpcs                  *domocks.MockVPCsService
 	vpcNatGateways        *domocks.MockVPCNATGatewaysService
@@ -332,7 +331,6 @@ func withTestClient(t *testing.T, tFn testFn) {
 		kubernetes:            domocks.NewMockKubernetesService(ctrl),
 		databases:             domocks.NewMockDatabasesService(ctrl),
 		registry:              domocks.NewMockRegistryService(ctrl),
-		registries:            domocks.NewMockRegistriesService(ctrl),
 		sshRunner:             domocks.NewMockRunner(ctrl),
 		vpcs:                  domocks.NewMockVPCsService(ctrl),
 		oneClick:              domocks.NewMockOneClickService(ctrl),
@@ -400,7 +398,6 @@ func withTestClient(t *testing.T, tFn testFn) {
 		Kubernetes:         func() do.KubernetesService { return tm.kubernetes },
 		Databases:          func() do.DatabasesService { return tm.databases },
 		Registry:           func() do.RegistryService { return tm.registry },
-		Registries:         func() do.RegistriesService { return tm.registries },
 		VPCs:               func() do.VPCsService { return tm.vpcs },
 		OneClicks:          func() do.OneClickService { return tm.oneClick },
 		Apps:               func() do.AppsService { return tm.apps },

commands/displayers/registry.go

@@ -19,7 +19,6 @@ import (
 	"time"
 
 	"github.com/digitalocean/doctl/do"
-	"github.com/digitalocean/godo"
 )
 
 type Registry struct {
@@ -404,51 +403,3 @@ func (t *RegistryAvailableRegions) KV() []map[string]any {
 
 	return out
 }
-
-type RegistryOptions struct {
-	Options *godo.RegistryOptions
-}
-
-func (r *RegistryOptions) JSON(out io.Writer) error {
-	return writeJSON(r.Options, out)
-}
-
-func (r *RegistryOptions) Cols() []string {
-	return []string{
-		"Type",
-		"Name",
-		"Slug",
-	}
-}
-
-func (r *RegistryOptions) ColMap() map[string]string {
-	return map[string]string{
-		"Type": "Option Type",
-		"Name": "Name",
-		"Slug": "Slug/Region",
-	}
-}
-
-func (r *RegistryOptions) KV() []map[string]any {
-	out := make([]map[string]any, 0)
-
-	// Add subscription tiers
-	for _, tier := range r.Options.SubscriptionTiers {
-		out = append(out, map[string]any{
-			"Type": "subscription-tier",
-			"Name": tier.Name,
-			"Slug": tier.Slug,
-		})
-	}
-
-	// Add available regions
-	for _, region := range r.Options.AvailableRegions {
-		out = append(out, map[string]any{
-			"Type": "available-region",
-			"Name": region,
-			"Slug": region,
-		})
-	}
-
-	return out
-}

commands/doit.go

@@ -184,7 +184,6 @@ func addCommands() {
 	DoitCmd.AddCommand(Projects())
 	DoitCmd.AddCommand(Version())
 	DoitCmd.AddCommand(Registry())
-	DoitCmd.AddCommand(Registries())
 	DoitCmd.AddCommand(VPCs())
 	DoitCmd.AddCommand(Network())
 	DoitCmd.AddCommand(OneClicks())