migrate rpc server to v3 cc api and prepare for future plugin interface refactoring

actor/pluginaction/config.go

@@ -14,5 +14,6 @@ type Config interface {
 	PluginRepositories() []configv3.PluginRepository
 	Plugins() []configv3.Plugin
 	RemovePlugin(string)
+	RemovePluginRepository(string)
 	WritePluginConfig() error
 }

actor/pluginaction/plugin_repository.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"code.cloudfoundry.org/cli/v8/actor/actionerror"
+	"code.cloudfoundry.org/cli/v8/api/plugin"
 	"code.cloudfoundry.org/cli/v8/util/configv3"
 )
 
@@ -64,6 +65,56 @@ func (actor Actor) IsPluginRepositoryRegistered(repositoryName string) bool {
 	return false
 }
 
+// RemovePluginRepository removes the registered repository whose name matches
+// repositoryName (trimmed, case-insensitive).
+func (actor Actor) RemovePluginRepository(repositoryName string) error {
+	repository, err := actor.GetPluginRepository(strings.TrimSpace(repositoryName))
+	if err != nil {
+		return err
+	}
+
+	actor.config.RemovePluginRepository(repository.Name)
+	return nil
+}
+
+// RepositoryPlugins lists the plugins available in a plugin repository.
+type RepositoryPlugins struct {
+	RepositoryName string
+	Plugins        []plugin.Plugin
+}
+
+// GetPluginsFromRepositories fetches the plugins of each repository, in order.
+// Repositories that cannot be fetched are skipped and reported as errors.
+func (actor Actor) GetPluginsFromRepositories(repositories []configv3.PluginRepository) ([]RepositoryPlugins, []error) {
+	var (
+		repositoryPlugins []RepositoryPlugins
+		errs              []error
+	)
+
+	for _, repository := range repositories {
+		repositoryURL := repository.URL
+		if repositoryURL == "http://plugins.cloudfoundry.org" {
+			repositoryURL = configv3.DefaultPluginRepoURL
+		}
+
+		pluginRepository, err := actor.client.GetPluginRepository(repositoryURL)
+		if err != nil {
+			errs = append(errs, actionerror.FetchingPluginInfoFromRepositoryError{
+				RepositoryName: repository.Name,
+				Err:            err,
+			})
+			continue
+		}
+
+		repositoryPlugins = append(repositoryPlugins, RepositoryPlugins{
+			RepositoryName: repository.Name,
+			Plugins:        pluginRepository.Plugins,
+		})
+	}
+
+	return repositoryPlugins, errs
+}
+
 func normalizeURLPath(rawURL string) (string, error) {
 	prefix := ""
 	if !strings.Contains(rawURL, "://") {

actor/pluginaction/plugin_repository_test.go

@@ -229,4 +229,71 @@ var _ = Describe("Plugin Repository Actions", func() {
 			})
 		})
 	})
+
+	Describe("RemovePluginRepository", func() {
+		BeforeEach(func() {
+			fakeConfig.PluginRepositoriesReturns([]configv3.PluginRepository{
+				{Name: "repo-a", URL: "https://a.com"},
+				{Name: "repo-b", URL: "https://b.com"},
+			})
+		})
+
+		When("the repository is registered", func() {
+			It("removes it, matching the trimmed name case-insensitively", func() {
+				err := actor.RemovePluginRepository(" Repo-B ")
+				Expect(err).ToNot(HaveOccurred())
+
+				Expect(fakeConfig.RemovePluginRepositoryCallCount()).To(Equal(1))
+				Expect(fakeConfig.RemovePluginRepositoryArgsForCall(0)).To(Equal("repo-b"))
+			})
+		})
+
+		When("the repository is not registered", func() {
+			It("returns a RepositoryNotRegisteredError and removes nothing", func() {
+				err := actor.RemovePluginRepository("unknown")
+				Expect(err).To(MatchError(actionerror.RepositoryNotRegisteredError{Name: "unknown"}))
+				Expect(fakeConfig.RemovePluginRepositoryCallCount()).To(Equal(0))
+			})
+		})
+	})
+
+	Describe("GetPluginsFromRepositories", func() {
+		var (
+			repositoryPlugins []RepositoryPlugins
+			errs              []error
+		)
+
+		BeforeEach(func() {
+			fakePluginClient.GetPluginRepositoryReturnsOnCall(0, plugin.PluginRepository{
+				Plugins: []plugin.Plugin{{Name: "plugin-1", Version: "1.0.0", Description: "first"}},
+			}, nil)
+			fakePluginClient.GetPluginRepositoryReturnsOnCall(1, plugin.PluginRepository{}, errors.New("404 not found"))
+		})
+
+		JustBeforeEach(func() {
+			repositoryPlugins, errs = actor.GetPluginsFromRepositories([]configv3.PluginRepository{
+				{Name: "community", URL: "http://plugins.cloudfoundry.org"},
+				{Name: "broken", URL: "https://broken.example.com"},
+			})
+		})
+
+		It("returns the plugins of each reachable repository, in order", func() {
+			Expect(repositoryPlugins).To(Equal([]RepositoryPlugins{
+				{RepositoryName: "community", Plugins: []plugin.Plugin{{Name: "plugin-1", Version: "1.0.0", Description: "first"}}},
+			}))
+		})
+
+		It("collects an error per unreachable repository and keeps going", func() {
+			Expect(errs).To(ConsistOf(actionerror.FetchingPluginInfoFromRepositoryError{
+				RepositoryName: "broken",
+				Err:            errors.New("404 not found"),
+			}))
+			Expect(fakePluginClient.GetPluginRepositoryCallCount()).To(Equal(2))
+		})
+
+		It("uses https for http://plugins.cloudfoundry.org", func() {
+			Expect(fakePluginClient.GetPluginRepositoryArgsForCall(0)).To(Equal("https://plugins.cloudfoundry.org"))
+			Expect(fakePluginClient.GetPluginRepositoryArgsForCall(1)).To(Equal("https://broken.example.com"))
+		})
+	})
 })

actor/v7action/route.go

@@ -313,7 +313,7 @@ func (actor Actor) GetRouteSummaries(routes []resources.Route) ([]RouteSummary,
 			AppProtocols:        appProtocols,
 			AppPorts:            appPorts,
 			SpaceName:           spaceNamesByGUID[route.SpaceGUID],
-			DomainName:          getDomainName(route.URL, route.Host, route.Path, route.Port),
+			DomainName:          DomainNameFromRouteURL(route.URL, route.Host, route.Path, route.Port),
 			ServiceInstanceName: serviceInstanceNameByRouteGUID[route.GUID],
 		})
 	}
@@ -478,7 +478,9 @@ func (actor Actor) GetRoutesByDomain(domainGUID, hostname, path string) ([]resou
 	return routes, Warnings(warnings), err
 }
 
-func getDomainName(fullURL, host, path string, port int) string {
+// DomainNameFromRouteURL extracts the domain name from a route URL by removing
+// the route's host prefix, path suffix and port suffix.
+func DomainNameFromRouteURL(fullURL, host, path string, port int) string {
 	domainWithoutHost := strings.TrimPrefix(fullURL, host+".")
 	domainWithoutPath := strings.TrimSuffix(domainWithoutHost, path)
 

actor/v7action/route_test.go

@@ -1915,4 +1915,14 @@ var _ = Describe("Route Actions", func() {
 			})
 		})
 	})
+
+	DescribeTable("DomainNameFromRouteURL",
+		func(fullURL, host, path string, port int, expected string) {
+			Expect(DomainNameFromRouteURL(fullURL, host, path, port)).To(Equal(expected))
+		},
+		Entry("HTTP route with a host", "myapp.apps.example.com", "myapp", "", 0, "apps.example.com"),
+		Entry("HTTP route with a host and a path", "myapp.apps.example.com/api", "myapp", "/api", 0, "apps.example.com"),
+		Entry("TCP route with a port", "tcp.example.com:1024", "", "", 1024, "tcp.example.com"),
+		Entry("route without a host", "apps.example.com", "", "", 0, "apps.example.com"),
+	)
 })

actor/v7action/service_instance_list.go

@@ -13,13 +13,17 @@ import (
 )
 
 type ServiceInstance struct {
+	GUID                string
 	Type                resources.ServiceInstanceType
 	Name                string
 	ServicePlanName     string
+	ServicePlanGUID     string
 	ServiceOfferingName string
 	ServiceBrokerName   string
 	BoundApps           []string
 	LastOperation       string
+	LastOperationType   resources.LastOperationType
+	LastOperationState  resources.LastOperationState
 	UpgradeAvailable    types.OptionalBoolean
 }
 
@@ -74,14 +78,18 @@ func (actor Actor) GetServiceInstancesForSpace(spaceGUID string, omitApps bool)
 	for i, instance := range instances {
 		names := planDetailsFromPlanGUIDLookup[instance.ServicePlanGUID]
 		result[i] = ServiceInstance{
+			GUID:                instance.GUID,
 			Name:                instance.Name,
 			Type:                instance.Type,
 			UpgradeAvailable:    instance.UpgradeAvailable,
 			ServicePlanName:     names.plan,
+			ServicePlanGUID:     instance.ServicePlanGUID,
 			ServiceOfferingName: names.offering,
 			ServiceBrokerName:   names.broker,
 			BoundApps:           boundAppsNamesFromInstanceGUIDLookup[instance.GUID],
 			LastOperation:       lastOperation(instance.LastOperation),
+			LastOperationType:   instance.LastOperation.Type,
+			LastOperationState:  instance.LastOperation.State,
 		}
 	}
 

actor/v7action/service_instance_list_test.go

@@ -240,55 +240,76 @@ var _ = Describe("Service Instance List Action", func() {
 
 				Expect(serviceInstances).To(Equal([]ServiceInstance{
 					{
+						GUID:                "fake-guid-1",
 						Name:                "msi1",
 						Type:                resources.ManagedServiceInstance,
 						ServicePlanName:     "fake-plan-1",
+						ServicePlanGUID:     "fake-plan-guid-1",
 						ServiceOfferingName: "fake-offering-1",
 						ServiceBrokerName:   "fake-broker-1",
 						UpgradeAvailable:    types.NewOptionalBoolean(true),
 						BoundApps:           []string{"great-app-1", "great-app-2"},
 						LastOperation:       "create succeeded",
+						LastOperationType:   resources.CreateOperation,
+						LastOperationState:  resources.OperationSucceeded,
 					},
 					{
+						GUID:                "fake-guid-2",
 						Name:                "msi2",
 						Type:                resources.ManagedServiceInstance,
 						ServicePlanName:     "fake-plan-2",
+						ServicePlanGUID:     "fake-plan-guid-2",
 						ServiceOfferingName: "fake-offering-2",
 						ServiceBrokerName:   "fake-broker-2",
 						UpgradeAvailable:    types.NewOptionalBoolean(false),
 						BoundApps:           []string{"great-app-3", "great-app-4"},
 						LastOperation:       "update succeeded",
+						LastOperationType:   resources.UpdateOperation,
+						LastOperationState:  resources.OperationSucceeded,
 					},
 					{
+						GUID:                "fake-guid-3",
 						Name:                "msi3",
 						Type:                resources.ManagedServiceInstance,
 						ServicePlanName:     "fake-plan-3",
+						ServicePlanGUID:     "fake-plan-guid-3",
 						ServiceOfferingName: "fake-offering-3",
 						ServiceBrokerName:   "fake-broker-2",
 						BoundApps:           []string{"great-app-5"},
 						LastOperation:       "create in progress",
+						LastOperationType:   resources.CreateOperation,
+						LastOperationState:  resources.OperationInProgress,
 					},
 					{
+						GUID:                "fake-guid-4",
 						Name:                "msi4",
 						Type:                resources.ManagedServiceInstance,
 						ServicePlanName:     "fake-plan-4",
+						ServicePlanGUID:     "fake-plan-guid-4",
 						ServiceOfferingName: "fake-offering-3",
 						ServiceBrokerName:   "fake-broker-2",
 						UpgradeAvailable:    types.NewOptionalBoolean(true),
 						BoundApps:           []string{"great-app-6"},
 						LastOperation:       "create failed",
+						LastOperationType:   resources.CreateOperation,
+						LastOperationState:  resources.OperationFailed,
 					},
 					{
+						GUID:                "fake-guid-5",
 						Name:                "msi5",
 						Type:                resources.ManagedServiceInstance,
 						ServicePlanName:     "fake-plan-4",
+						ServicePlanGUID:     "fake-plan-guid-4",
 						ServiceOfferingName: "fake-offering-3",
 						ServiceBrokerName:   "fake-broker-2",
 						UpgradeAvailable:    types.NewOptionalBoolean(false),
 						BoundApps:           []string{"great-app-6"},
 						LastOperation:       "delete in progress",
+						LastOperationType:   resources.DeleteOperation,
+						LastOperationState:  resources.OperationInProgress,
 					},
 					{
+						GUID:      "fake-guid-6",
 						Name:      "upsi",
 						Type:      resources.UserProvidedServiceInstance,
 						BoundApps: nil,

cf/cmd/cmd.go

@@ -23,6 +23,7 @@ import (
 	"code.cloudfoundry.org/cli/v8/cf/trace"
 	"code.cloudfoundry.org/cli/v8/cf/util/spellcheck"
 	"code.cloudfoundry.org/cli/v8/plugin/rpc"
+	"code.cloudfoundry.org/cli/v8/util/configv3"
 
 	netrpc "net/rpc"
 )
@@ -139,7 +140,15 @@ func Main(traceEnv string, args []string) {
 
 	// non core command, try plugin command
 	server := netrpc.NewServer()
-	rpcService, err := rpc.NewRpcService(deps.TeePrinter, deps.TeePrinter, deps.Config, deps.RepoLocator, rpc.NewCommandRunner(), deps.Logger, Writer, server)
+
+	// Load configv3.Config for RPC service
+	v3Config, err := configv3.LoadConfig()
+	if err != nil {
+		deps.UI.Say(T("Error loading config: ") + err.Error())
+		os.Exit(1)
+	}
+
+	rpcService, err := rpc.NewRpcService(v3Config, server, nil, nil, nil)
 	if err != nil {
 		deps.UI.Say(T("Error initializing RPC service: ") + err.Error())
 		os.Exit(1)