feat: remove resource api client from api module (#18984)

* feat: remove resource api client from api module

* fix: go mod clean up

api/go.mod

@@ -2,14 +2,10 @@ module github.com/hashicorp/consul/api
 
 go 1.19
 
-replace (
+replace github.com/hashicorp/consul/sdk => ../sdk
-	github.com/hashicorp/consul/proto-public => ../proto-public
-	github.com/hashicorp/consul/sdk => ../sdk
-)
 
 require (
 	github.com/google/go-cmp v0.5.9
-	github.com/hashicorp/consul/proto-public v0.4.1
 	github.com/hashicorp/consul/sdk v0.14.1
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-hclog v1.5.0
@@ -25,7 +21,6 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fatih/color v1.14.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -47,9 +42,5 @@ require (
 	golang.org/x/net v0.13.0 // indirect
 	golang.org/x/sync v0.2.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.55.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

api/go.sum

@@ -35,15 +35,11 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -222,20 +218,10 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

api/resource.go

@@ -1,126 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package api
-
-import (
-	"fmt"
-	"net/http"
-	"strings"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type Resource struct {
-	c *Client
-}
-
-type GVK struct {
-	Group   string
-	Version string
-	Kind    string
-}
-
-type WriteRequest struct {
-	Metadata map[string]string `json:"metadata"`
-	Data     map[string]any    `json:"data"`
-	Owner    *pbresource.ID    `json:"owner"`
-}
-
-type WriteResponse struct {
-	Metadata   map[string]string `json:"metadata"`
-	Data       map[string]any    `json:"data"`
-	Owner      *pbresource.ID    `json:"owner,omitempty"`
-	ID         *pbresource.ID    `json:"id"`
-	Version    string            `json:"version"`
-	Generation string            `json:"generation"`
-	Status     map[string]any    `json:"status"`
-}
-
-type ListResponse struct {
-	Resources []WriteResponse `json:"resources"`
-}
-
-// Config returns a handle to the Config endpoints
-func (c *Client) Resource() *Resource {
-	return &Resource{c}
-}
-
-func (resource *Resource) Read(gvk *GVK, resourceName string, q *QueryOptions) (map[string]interface{}, error) {
-	r := resource.c.newRequest("GET", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName)))
-	r.setQueryOptions(q)
-	_, resp, err := resource.c.doRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer closeResponseBody(resp)
-	if err := requireOK(resp); err != nil {
-		return nil, err
-	}
-
-	var out map[string]interface{}
-	if err := decodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
-
-func (resource *Resource) Delete(gvk *GVK, resourceName string, q *QueryOptions) error {
-	r := resource.c.newRequest("DELETE", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName)))
-	r.setQueryOptions(q)
-	_, resp, err := resource.c.doRequest(r)
-	if err != nil {
-		return err
-	}
-	defer closeResponseBody(resp)
-	if err := requireHttpCodes(resp, http.StatusNoContent); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (resource *Resource) Apply(gvk *GVK, resourceName string, q *QueryOptions, payload *WriteRequest) (*WriteResponse, *WriteMeta, error) {
-	url := strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName))
-
-	r := resource.c.newRequest("PUT", url)
-	r.setQueryOptions(q)
-	r.obj = payload
-	rtt, resp, err := resource.c.doRequest(r)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer closeResponseBody(resp)
-	if err := requireOK(resp); err != nil {
-		return nil, nil, err
-	}
-
-	wm := &WriteMeta{}
-	wm.RequestTime = rtt
-
-	var out *WriteResponse
-	if err := decodeBody(resp, &out); err != nil {
-		return nil, nil, err
-	}
-	return out, wm, nil
-}
-
-func (resource *Resource) List(gvk *GVK, q *QueryOptions) (*ListResponse, error) {
-	r := resource.c.newRequest("GET", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind)))
-	r.setQueryOptions(q)
-	_, resp, err := resource.c.doRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer closeResponseBody(resp)
-	if err := requireOK(resp); err != nil {
-		return nil, err
-	}
-
-	var out *ListResponse
-	if err := decodeBody(resp, &out); err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}

command/resource/apply/apply.go

@@ -12,11 +12,10 @@ import (
 	"github.com/mitchellh/cli"
 	"google.golang.org/protobuf/encoding/protojson"
 
-	"github.com/hashicorp/consul/agent/consul"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/hashicorp/consul/command/resource"
-	"github.com/hashicorp/consul/internal/resourcehcl"
+	"github.com/hashicorp/consul/command/resource/client"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
@@ -45,7 +44,7 @@ func (c *cmd) init() {
 	c.help = flags.Usage(help, c.flags)
 }
 
-func makeWriteRequest(parsedResource *pbresource.Resource) (payload *api.WriteRequest, error error) {
+func makeWriteRequest(parsedResource *pbresource.Resource) (payload *resource.WriteRequest, error error) {
 	// The parsed hcl file has data field in proto message format anypb.Any
 	// Converting to json format requires us to fisrt marshal it then unmarshal it
 	data, err := protojson.Marshal(parsedResource.Data)
@@ -60,7 +59,7 @@ func makeWriteRequest(parsedResource *pbresource.Resource) (payload *api.WriteRe
 	}
 	delete(resourceData, "@type")
 
-	return &api.WriteRequest{
+	return &resource.WriteRequest{
 		Data:     resourceData,
 		Metadata: parsedResource.GetMetadata(),
 		Owner:    parsedResource.GetOwner(),
@@ -94,20 +93,25 @@ func (c *cmd) Run(args []string) int {
 		return 1
 	}
 
-	client, err := c.http.APIClient()
+	config := api.DefaultConfig()
+
+	c.http.MergeOntoConfig(config)
+	resourceClient, err := client.NewClient(config)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
 		return 1
 	}
 
-	opts := &api.QueryOptions{
+	res := resource.Resource{C: resourceClient}
+
+	opts := &client.QueryOptions{
 		Namespace: parsedResource.Id.Tenancy.GetNamespace(),
 		Partition: parsedResource.Id.Tenancy.GetPartition(),
 		Peer:      parsedResource.Id.Tenancy.GetPeerName(),
 		Token:     c.http.Token(),
 	}
 
-	gvk := &api.GVK{
+	gvk := &resource.GVK{
 		Group:   parsedResource.Id.Type.GetGroup(),
 		Version: parsedResource.Id.Type.GetGroupVersion(),
 		Kind:    parsedResource.Id.Type.GetKind(),
@@ -119,7 +123,7 @@ func (c *cmd) Run(args []string) int {
 		return 1
 	}
 
-	entry, _, err := client.Resource().Apply(gvk, parsedResource.Id.GetName(), opts, writeRequest)
+	entry, err := res.Apply(gvk, parsedResource.Id.GetName(), opts, writeRequest)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error writing resource %s/%s: %v", gvk, parsedResource.Id.GetName(), err))
 		return 1
@@ -136,17 +140,6 @@ func (c *cmd) Run(args []string) int {
 	return 0
 }
 
-func parseResource(data string) (resource *pbresource.Resource, e error) {
-	// parse the data
-	raw := []byte(data)
-	resource, err := resourcehcl.Unmarshal(raw, consul.NewTypeRegistry())
-	if err != nil {
-		return nil, fmt.Errorf("Failed to decode resource from input file: %v", err)
-	}
-
-	return resource, nil
-}
-
 func (c *cmd) Synopsis() string {
 	return synopsis
 }

command/resource/delete/delete.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/hashicorp/consul/command/resource"
+	"github.com/hashicorp/consul/command/resource/client"
 )
 
 func New(ui cli.Ui) *cmd {
@@ -42,9 +43,9 @@ func (c *cmd) init() {
 }
 
 func (c *cmd) Run(args []string) int {
-	var gvk *api.GVK
+	var gvk *resource.GVK
 	var resourceName string
-	var opts *api.QueryOptions
+	var opts *client.QueryOptions
 
 	if err := c.flags.Parse(args); err != nil {
 		if !errors.Is(err, flag.ErrHelp) {
@@ -66,13 +67,13 @@ func (c *cmd) Run(args []string) int {
 				return 1
 			}
 
-			gvk = &api.GVK{
+			gvk = &resource.GVK{
 				Group:   parsedResource.Id.Type.GetGroup(),
 				Version: parsedResource.Id.Type.GetGroupVersion(),
 				Kind:    parsedResource.Id.Type.GetKind(),
 			}
 			resourceName = parsedResource.Id.GetName()
-			opts = &api.QueryOptions{
+			opts = &client.QueryOptions{
 				Namespace: parsedResource.Id.Tenancy.GetNamespace(),
 				Partition: parsedResource.Id.Tenancy.GetPartition(),
 				Peer:      parsedResource.Id.Tenancy.GetPeerName(),
@@ -104,7 +105,7 @@ func (c *cmd) Run(args []string) int {
 			c.UI.Error("Incorrect argument format: File argument is not needed when resource information is provided with the command")
 			return 1
 		}
-		opts = &api.QueryOptions{
+		opts = &client.QueryOptions{
 			Namespace: c.http.Namespace(),
 			Partition: c.http.Partition(),
 			Peer:      c.http.PeerName(),
@@ -112,13 +113,18 @@ func (c *cmd) Run(args []string) int {
 		}
 	}
 
-	client, err := c.http.APIClient()
+	config := api.DefaultConfig()
+
+	c.http.MergeOntoConfig(config)
+	resourceClient, err := client.NewClient(config)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
 		return 1
 	}
 
-	if err := client.Resource().Delete(gvk, resourceName, opts); err != nil {
+	res := resource.Resource{C: resourceClient}
+
+	if err := res.Delete(gvk, resourceName, opts); err != nil {
 		c.UI.Error(fmt.Sprintf("Error deleting resource %s.%s.%s/%s: %v", gvk.Group, gvk.Version, gvk.Kind, resourceName, err))
 		return 1
 	}

command/resource/helper.go

@@ -7,11 +7,12 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/hashicorp/consul/agent/consul"
-	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/helpers"
+	"github.com/hashicorp/consul/command/resource/client"
 	"github.com/hashicorp/consul/internal/resourcehcl"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
@@ -38,7 +39,7 @@ func ParseInputParams(inputArgs []string, flags *flag.FlagSet) error {
 	return nil
 }
 
-func GetTypeAndResourceName(args []string) (gvk *api.GVK, resourceName string, e error) {
+func GetTypeAndResourceName(args []string) (gvk *GVK, resourceName string, e error) {
 	// it has to be resource name after the type
 	if strings.HasPrefix(args[1], "-") {
 		return nil, "", fmt.Errorf("Must provide resource name right after type")
@@ -49,7 +50,7 @@ func GetTypeAndResourceName(args []string) (gvk *api.GVK, resourceName string, e
 		return nil, "", fmt.Errorf("Must include resource type argument in group.verion.kind format")
 	}
 
-	gvk = &api.GVK{
+	gvk = &GVK{
 		Group:   s[0],
 		Version: s[1],
 		Kind:    s[2],
@@ -58,3 +59,101 @@ func GetTypeAndResourceName(args []string) (gvk *api.GVK, resourceName string, e
 	resourceName = args[1]
 	return
 }
+
+type Resource struct {
+	C *client.Client
+}
+
+type GVK struct {
+	Group   string
+	Version string
+	Kind    string
+}
+
+type WriteRequest struct {
+	Metadata map[string]string `json:"metadata"`
+	Data     map[string]any    `json:"data"`
+	Owner    *pbresource.ID    `json:"owner"`
+}
+
+type ListResponse struct {
+	Resources []map[string]interface{} `json:"resources"`
+}
+
+func (resource *Resource) Read(gvk *GVK, resourceName string, q *client.QueryOptions) (map[string]interface{}, error) {
+	r := resource.C.NewRequest("GET", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName)))
+	r.SetQueryOptions(q)
+	_, resp, err := resource.C.DoRequest(r)
+	if err != nil {
+		return nil, err
+	}
+	defer client.CloseResponseBody(resp)
+	if err := client.RequireOK(resp); err != nil {
+		return nil, err
+	}
+
+	var out map[string]interface{}
+	if err := client.DecodeBody(resp, &out); err != nil {
+		return nil, err
+	}
+
+	return out, nil
+}
+
+func (resource *Resource) Delete(gvk *GVK, resourceName string, q *client.QueryOptions) error {
+	r := resource.C.NewRequest("DELETE", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName)))
+	r.SetQueryOptions(q)
+	_, resp, err := resource.C.DoRequest(r)
+	if err != nil {
+		return err
+	}
+	defer client.CloseResponseBody(resp)
+	if err := client.RequireHttpCodes(resp, http.StatusNoContent); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (resource *Resource) Apply(gvk *GVK, resourceName string, q *client.QueryOptions, payload *WriteRequest) (*map[string]interface{}, error) {
+	url := strings.ToLower(fmt.Sprintf("/api/%s/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind, resourceName))
+
+	r := resource.C.NewRequest("PUT", url)
+	r.SetQueryOptions(q)
+	r.Obj = payload
+	_, resp, err := resource.C.DoRequest(r)
+	if err != nil {
+		return nil, err
+	}
+	defer client.CloseResponseBody(resp)
+	if err := client.RequireOK(resp); err != nil {
+		return nil, err
+	}
+
+	var out map[string]interface{}
+
+	if err := client.DecodeBody(resp, &out); err != nil {
+		return nil, err
+	}
+
+	return &out, nil
+}
+
+func (resource *Resource) List(gvk *GVK, q *client.QueryOptions) (*ListResponse, error) {
+	r := resource.C.NewRequest("GET", strings.ToLower(fmt.Sprintf("/api/%s/%s/%s", gvk.Group, gvk.Version, gvk.Kind)))
+	r.SetQueryOptions(q)
+	_, resp, err := resource.C.DoRequest(r)
+	if err != nil {
+		return nil, err
+	}
+	defer client.CloseResponseBody(resp)
+	if err := client.RequireOK(resp); err != nil {
+		return nil, err
+	}
+
+	var out *ListResponse
+	if err := client.DecodeBody(resp, &out); err != nil {
+		return nil, err
+	}
+
+	return out, nil
+}

command/resource/list/list.go

@@ -15,6 +15,7 @@ import (
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/hashicorp/consul/command/resource"
+	"github.com/hashicorp/consul/command/resource/client"
 )
 
 func New(ui cli.Ui) *cmd {
@@ -44,8 +45,8 @@ func (c *cmd) init() {
 }
 
 func (c *cmd) Run(args []string) int {
-	var gvk *api.GVK
+	var gvk *resource.GVK
-	var opts *api.QueryOptions
+	var opts *client.QueryOptions
 
 	if err := c.flags.Parse(args); err != nil {
 		if !errors.Is(err, flag.ErrHelp) {
@@ -67,12 +68,12 @@ func (c *cmd) Run(args []string) int {
 				return 1
 			}
 
-			gvk = &api.GVK{
+			gvk = &resource.GVK{
 				Group:   parsedResource.Id.Type.GetGroup(),
 				Version: parsedResource.Id.Type.GetGroupVersion(),
 				Kind:    parsedResource.Id.Type.GetKind(),
 			}
-			opts = &api.QueryOptions{
+			opts = &client.QueryOptions{
 				Namespace:         parsedResource.Id.Tenancy.GetNamespace(),
 				Partition:         parsedResource.Id.Tenancy.GetPartition(),
 				Peer:              parsedResource.Id.Tenancy.GetPeerName(),
@@ -103,7 +104,7 @@ func (c *cmd) Run(args []string) int {
 			return 1
 		}
 
-		opts = &api.QueryOptions{
+		opts = &client.QueryOptions{
 			Namespace:         c.http.Namespace(),
 			Partition:         c.http.Partition(),
 			Peer:              c.http.PeerName(),
@@ -112,13 +113,18 @@ func (c *cmd) Run(args []string) int {
 		}
 	}
 
-	client, err := c.http.APIClient()
+	config := api.DefaultConfig()
+
+	c.http.MergeOntoConfig(config)
+	resourceClient, err := client.NewClient(config)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
 		return 1
 	}
 
-	entry, err := client.Resource().List(gvk, opts)
+	res := resource.Resource{C: resourceClient}
+
+	entry, err := res.List(gvk, opts)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error reading resources for type %s: %v", gvk, err))
 		return 1
@@ -134,7 +140,7 @@ func (c *cmd) Run(args []string) int {
 	return 0
 }
 
-func getResourceType(args []string) (gvk *api.GVK, e error) {
+func getResourceType(args []string) (gvk *resource.GVK, e error) {
 	if len(args) < 1 {
 		return nil, fmt.Errorf("Must include resource type argument")
 	}
@@ -147,7 +153,7 @@ func getResourceType(args []string) (gvk *api.GVK, e error) {
 	if len(s) < 3 {
 		return nil, fmt.Errorf("Must include resource type argument in group.verion.kind format")
 	}
-	gvk = &api.GVK{
+	gvk = &resource.GVK{
 		Group:   s[0],
 		Version: s[1],
 		Kind:    s[2],

command/resource/read/read.go

@@ -14,6 +14,7 @@ import (
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/command/flags"
 	"github.com/hashicorp/consul/command/resource"
+	"github.com/hashicorp/consul/command/resource/client"
 )
 
 func New(ui cli.Ui) *cmd {
@@ -43,9 +44,9 @@ func (c *cmd) init() {
 }
 
 func (c *cmd) Run(args []string) int {
-	var gvk *api.GVK
+	var gvk *resource.GVK
 	var resourceName string
-	var opts *api.QueryOptions
+	var opts *client.QueryOptions
 
 	if err := c.flags.Parse(args); err != nil {
 		if !errors.Is(err, flag.ErrHelp) {
@@ -67,13 +68,13 @@ func (c *cmd) Run(args []string) int {
 				return 1
 			}
 
-			gvk = &api.GVK{
+			gvk = &resource.GVK{
 				Group:   parsedResource.Id.Type.GetGroup(),
 				Version: parsedResource.Id.Type.GetGroupVersion(),
 				Kind:    parsedResource.Id.Type.GetKind(),
 			}
 			resourceName = parsedResource.Id.GetName()
-			opts = &api.QueryOptions{
+			opts = &client.QueryOptions{
 				Namespace:         parsedResource.Id.Tenancy.GetNamespace(),
 				Partition:         parsedResource.Id.Tenancy.GetPartition(),
 				Peer:              parsedResource.Id.Tenancy.GetPeerName(),
@@ -106,7 +107,7 @@ func (c *cmd) Run(args []string) int {
 			c.UI.Error("Incorrect argument format: File argument is not needed when resource information is provided with the command")
 			return 1
 		}
-		opts = &api.QueryOptions{
+		opts = &client.QueryOptions{
 			Namespace:         c.http.Namespace(),
 			Partition:         c.http.Partition(),
 			Peer:              c.http.PeerName(),
@@ -115,13 +116,18 @@ func (c *cmd) Run(args []string) int {
 		}
 	}
 
-	client, err := c.http.APIClient()
+	config := api.DefaultConfig()
+
+	c.http.MergeOntoConfig(config)
+	resourceClient, err := client.NewClient(config)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error connect to Consul agent: %s", err))
 		return 1
 	}
 
-	entry, err := client.Resource().Read(gvk, resourceName, opts)
+	res := resource.Resource{C: resourceClient}
+
+	entry, err := res.Read(gvk, resourceName, opts)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error reading resource %s/%s: %v", gvk, resourceName, err))
 		return 1

envoyextensions/go.mod

@@ -4,7 +4,6 @@ go 1.20
 
 replace (
 	github.com/hashicorp/consul/api => ../api
-	github.com/hashicorp/consul/proto-public => ../proto-public
 	github.com/hashicorp/consul/sdk => ../sdk
 )
 
@@ -28,7 +27,6 @@ require (
 	github.com/envoyproxy/protoc-gen-validate v0.10.0 // indirect
 	github.com/fatih/color v1.14.1 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/hashicorp/consul/proto-public v0.4.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -43,10 +41,7 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/net v0.13.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.55.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

envoyextensions/go.sum

@@ -201,7 +201,6 @@ golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
-golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -237,8 +236,6 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -256,8 +253,6 @@ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaL
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=

go.mod

@@ -54,6 +54,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-raftchunking v0.7.0
 	github.com/hashicorp/go-retryablehttp v0.6.7
+	github.com/hashicorp/go-rootcerts v1.0.2
 	github.com/hashicorp/go-secure-stdlib/awsutil v0.1.6
 	github.com/hashicorp/go-sockaddr v1.0.2
 	github.com/hashicorp/go-syslog v1.0.0
@@ -198,7 +199,6 @@ require (
 	github.com/hashicorp/go-msgpack v0.5.5 // indirect
 	github.com/hashicorp/go-msgpack/v2 v2.0.0 // indirect
 	github.com/hashicorp/go-plugin v1.4.5 // indirect
-	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect

troubleshoot/go.mod

@@ -30,7 +30,6 @@ require (
 	github.com/envoyproxy/protoc-gen-validate v0.10.0 // indirect
 	github.com/fatih/color v1.14.1 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/hashicorp/consul/proto-public v0.4.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
@@ -40,12 +39,14 @@ require (
 	github.com/hashicorp/go-version v1.2.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
 	golang.org/x/net v0.13.0 // indirect
@@ -53,5 +54,6 @@ require (
 	golang.org/x/text v0.11.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/grpc v1.55.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

troubleshoot/go.sum

@@ -70,6 +70,7 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
 github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -210,10 +211,13 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -271,7 +275,9 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
@@ -585,6 +591,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=