Build resolvers from shared repos (#436)

Refactors `pkg/resolve` to hook into our dependency injection system.
This eliminates the need for callers to instantiate clients, and let's us re-use existing repository instances.

This is supporting work for `render pg create`. I realized while implementing that that I had handled dependencies wrong in kv. We have a nice DI system set up so that the command layer should really only care about Service structs and not repos / clients. I can go back and refactor kv later, but for now I just want to make sure I get `pg` on the right path.

GitOrigin-RevId: 9cd87d1b98ed32ae960b8405ccae986f30af36af

Author: davidharting

cmd/kvdelete.go

@@ -67,7 +67,7 @@ func init() {
 				if err != nil {
 					return nil, err
 				}
-				env, err = resolve.New(c).ResolveEnvironment(cmd.Context(), *input.EnvironmentIDOrName)
+				env, err = resolve.NewFromClient(c).ResolveEnvironment(cmd.Context(), *input.EnvironmentIDOrName)
 				if err != nil {
 					return nil, err
 				}

cmd/kvget.go

@@ -70,7 +70,7 @@ func init() {
 				if err != nil {
 					return nil, err
 				}
-				scope, err := resolve.New(c).ResolveScopeInActiveWorkspace(cmd.Context(), resolve.ActiveWorkspaceScopeInput{
+				scope, err := resolve.NewFromClient(c).ResolveScopeInActiveWorkspace(cmd.Context(), resolve.ActiveWorkspaceScopeInput{
 					ProjectIDOrName:     input.ProjectIDOrName,
 					EnvironmentIDOrName: input.EnvironmentIDOrName,
 				})

cmd/kvlist.go

@@ -87,7 +87,7 @@ func resolveListEnvIDs(cmd *cobra.Command, input kvtypes.KeyValueListInput) ([]s
 	if err != nil {
 		return nil, false, err
 	}
-	scope, err := resolve.New(c).ResolveScopeInActiveWorkspace(cmd.Context(), resolve.ActiveWorkspaceScopeInput{
+	scope, err := resolve.NewFromClient(c).ResolveScopeInActiveWorkspace(cmd.Context(), resolve.ActiveWorkspaceScopeInput{
 		ProjectIDOrName:     input.ProjectIDOrName,
 		EnvironmentIDOrName: input.EnvironmentIDOrName,
 	})

cmd/kvresume.go

@@ -59,7 +59,7 @@ func init() {
 				if err != nil {
 					return nil, err
 				}
-				scope, err := resolve.New(c).ResolveScopeInActiveWorkspace(cmd.Context(), resolve.ActiveWorkspaceScopeInput{
+				scope, err := resolve.NewFromClient(c).ResolveScopeInActiveWorkspace(cmd.Context(), resolve.ActiveWorkspaceScopeInput{
 					EnvironmentIDOrName: input.EnvironmentIDOrName,
 				})
 				if err != nil {

cmd/kvsuspend.go

@@ -66,7 +66,7 @@ func init() {
 				if err != nil {
 					return nil, err
 				}
-				scope, err := resolve.New(c).ResolveScopeInActiveWorkspace(cmd.Context(), resolve.ActiveWorkspaceScopeInput{
+				scope, err := resolve.NewFromClient(c).ResolveScopeInActiveWorkspace(cmd.Context(), resolve.ActiveWorkspaceScopeInput{
 					EnvironmentIDOrName: input.EnvironmentIDOrName,
 				})
 				if err != nil {

cmd/kvupdate.go

@@ -103,7 +103,7 @@ Example: --ip-allow-list "cidr=203.0.113.5/32,description=office"`
 					if err != nil {
 						return nil, err
 					}
-					env, err = resolve.New(c).ResolveEnvironment(cmd.Context(), *input.EnvironmentIDOrName)
+					env, err = resolve.NewFromClient(c).ResolveEnvironment(cmd.Context(), *input.EnvironmentIDOrName)
 					if err != nil {
 						return nil, err
 					}

pkg/dependencies/dependencies.go

@@ -14,6 +14,7 @@ import (
 	"github.com/render-oss/cli/pkg/postgres"
 	"github.com/render-oss/cli/pkg/project"
 	"github.com/render-oss/cli/pkg/registry"
+	"github.com/render-oss/cli/pkg/resolve"
 	"github.com/render-oss/cli/pkg/resource"
 	"github.com/render-oss/cli/pkg/service"
 	"github.com/render-oss/cli/pkg/tasks"
@@ -53,6 +54,7 @@ type cachedDependencies struct {
 	userRepo            cache[*user.Repo]
 	ownerRepo           cache[*owner.Repo]
 	deployRepo          cache[*deploy.Repo]
+	resolver            cache[*resolve.Resolver]
 	serviceService      cache[*service.Service]
 	postgresService     cache[*postgres.Service]
 	keyValueService     cache[*keyvalue.Service]
@@ -158,6 +160,12 @@ func (d *Dependencies) OwnerRepo() *owner.Repo {
 	})
 }
 
+func (d *Dependencies) Resolver() *resolve.Resolver {
+	return d.cache.resolver.Get(func() *resolve.Resolver {
+		return resolve.New(d.OwnerRepo(), d.ProjectRepo(), d.EnvironmentRepo())
+	})
+}
+
 func (d *Dependencies) DeployRepo() *deploy.Repo {
 	return d.cache.deployRepo.Get(func() *deploy.Repo {
 		return deploy.NewRepo(d.client)

pkg/keyvalue/create.go

@@ -23,7 +23,7 @@ func Create(ctx context.Context, input kvtypes.KeyValueCreateInput) (*client.Key
 	if err != nil {
 		return nil, err
 	}
-	resolver := resolve.New(c)
+	resolver := resolve.NewFromClient(c)
 
 	if input.Name == "" {
 		input.Name = petname.Generate(2, "-")

pkg/resolve/resolve.go

@@ -59,14 +59,23 @@ func (s *Scope) EnvironmentID() *string {
 	return &s.Environment.Id
 }
 
-func New(c *client.ClientWithResponses) *Resolver {
+// New builds a Resolver from existing repos. Prefer this so callers can share
+// cached repo instances from a dependency container instead of constructing a
+// parallel set of repos for the same HTTP client.
+func New(ownerRepo *owner.Repo, projectRepo *project.Repo, environmentRepo *environment.Repo) *Resolver {
 	return &Resolver{
-		ownerRepo:       owner.NewRepo(c),
-		projectRepo:     project.NewRepo(c),
-		environmentRepo: environment.NewRepo(c),
+		ownerRepo:       ownerRepo,
+		projectRepo:     projectRepo,
+		environmentRepo: environmentRepo,
 	}
 }
 
+// NewFromClient builds a Resolver with repos backed by the given HTTP client.
+// Prefer New when a dependency container or shared repos are already available.
+func NewFromClient(c *client.ClientWithResponses) *Resolver {
+	return New(owner.NewRepo(c), project.NewRepo(c), environment.NewRepo(c))
+}
+
 // ResolveScope resolves explicitly supplied resources and their ancestors.
 // Project input resolves workspace and project; environment input resolves
 // workspace, project, and environment. It does not infer descendant resources

pkg/resolve/resolve_test.go

@@ -20,7 +20,7 @@ func newTestResolver(t *testing.T, server *renderapi.Server) *Resolver {
 
 	c, err := client.NewClientWithResponses(server.URL())
 	require.NoError(t, err)
-	return New(c)
+	return NewFromClient(c)
 }
 
 func seedOwner(server *renderapi.Server, id string) {