Remove auto update client wrapper

api/client/client.go

@@ -51,7 +51,6 @@ import (
 	"github.com/gravitational/teleport/api/breaker"
 	"github.com/gravitational/teleport/api/client/accesslist"
 	"github.com/gravitational/teleport/api/client/accessmonitoringrules"
-	"github.com/gravitational/teleport/api/client/autoupdate"
 	crownjewelapi "github.com/gravitational/teleport/api/client/crownjewel"
 	"github.com/gravitational/teleport/api/client/discoveryconfig"
 	"github.com/gravitational/teleport/api/client/externalauditstorage"
@@ -893,8 +892,8 @@ func (c *Client) GetVnetConfig(ctx context.Context) (*vnet.VnetConfig, error) {
 }
 
 // AutoUpdateServiceClient returns an unadorned client for the AutoUpdate service.
-func (c *Client) AutoUpdateServiceClient() *autoupdate.Client {
-	return autoupdate.NewClient(autoupdatev1pb.NewAutoUpdateServiceClient(c.conn))
+func (c *Client) AutoUpdateServiceClient() autoupdatev1pb.AutoUpdateServiceClient {
+	return autoupdatev1pb.NewAutoUpdateServiceClient(c.conn)
 }
 
 // Ping gets basic info about the auth server.
@@ -2870,18 +2869,18 @@ func (c *Client) GetClusterAuditConfig(ctx context.Context) (types.ClusterAuditC
 	return resp, nil
 }
 
-// GetAutoUpdateConfig gets autoupdate configuration.
+// GetAutoUpdateConfig gets AutoUpdateConfig resource.
 func (c *Client) GetAutoUpdateConfig(ctx context.Context) (*autoupdatev1pb.AutoUpdateConfig, error) {
-	resp, err := c.AutoUpdateServiceClient().GetAutoUpdateConfig(ctx)
+	resp, err := c.AutoUpdateServiceClient().GetAutoUpdateConfig(ctx, &autoupdatev1pb.GetAutoUpdateConfigRequest{})
 	if err != nil {
 		return nil, trace.Wrap(err)
 	}
 	return resp, nil
 }
 
-// GetAutoUpdateVersion gets autoupdate version.
+// GetAutoUpdateVersion gets AutoUpdateVersion resource.
 func (c *Client) GetAutoUpdateVersion(ctx context.Context) (*autoupdatev1pb.AutoUpdateVersion, error) {
-	resp, err := c.AutoUpdateServiceClient().GetAutoUpdateVersion(ctx)
+	resp, err := c.AutoUpdateServiceClient().GetAutoUpdateVersion(ctx, &autoupdatev1pb.GetAutoUpdateVersionRequest{})
 	if err != nil {
 		return nil, trace.Wrap(err)
 	}

lib/auth/authclient/clt.go

@@ -31,14 +31,14 @@ import (
 	"golang.org/x/crypto/ssh"
 
 	"github.com/gravitational/teleport/api/client"
-	"github.com/gravitational/teleport/api/client/autoupdate"
 	"github.com/gravitational/teleport/api/client/crownjewel"
 	"github.com/gravitational/teleport/api/client/databaseobject"
 	"github.com/gravitational/teleport/api/client/externalauditstorage"
 	"github.com/gravitational/teleport/api/client/proto"
 	"github.com/gravitational/teleport/api/client/secreport"
 	apidefaults "github.com/gravitational/teleport/api/defaults"
 	accessgraphsecretsv1pb "github.com/gravitational/teleport/api/gen/proto/go/teleport/accessgraph/v1"
+	autoupdatev1pb "github.com/gravitational/teleport/api/gen/proto/go/teleport/autoupdate/v1"
 	clusterconfigpb "github.com/gravitational/teleport/api/gen/proto/go/teleport/clusterconfig/v1"
 	dbobjectimportrulev1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/dbobjectimportrule/v1"
 	devicepb "github.com/gravitational/teleport/api/gen/proto/go/teleport/devicetrust/v1"
@@ -1824,8 +1824,8 @@ type ClientI interface {
 	// will return "not implemented" errors (as per the default gRPC behavior).
 	StaticHostUserClient() services.StaticHostUser
 
-	// AutoUpdateServiceClient returns a Autoupdate service client.
-	AutoUpdateServiceClient() *autoupdate.Client
+	// AutoUpdateServiceClient returns a AutoUpdate service client.
+	AutoUpdateServiceClient() autoupdatev1pb.AutoUpdateServiceClient
 
 	// CloneHTTPClient creates a new HTTP client with the same configuration.
 	CloneHTTPClient(params ...roundtrip.ClientParam) (*HTTPClient, error)

lib/auth/autoupdate/autoupdatev1/service.go

@@ -32,24 +32,24 @@ import (
 
 // Cache defines only read-only service methods.
 type Cache interface {
-	// GetAutoUpdateConfig gets the autoupdate configuration from the backend.
+	// GetAutoUpdateConfig gets the AutoUpdateConfig from the backend.
 	GetAutoUpdateConfig(ctx context.Context) (*autoupdate.AutoUpdateConfig, error)
 
-	// GetAutoUpdateVersion gets the autoupdate version from the backend.
+	// GetAutoUpdateVersion gets the AutoUpdateVersion from the backend.
 	GetAutoUpdateVersion(ctx context.Context) (*autoupdate.AutoUpdateVersion, error)
 }
 
-// ServiceConfig holds configuration options for the autoupdate gRPC service.
+// ServiceConfig holds configuration options for the auto update gRPC service.
 type ServiceConfig struct {
 	// Authorizer is the authorizer used to check access to resources.
 	Authorizer authz.Authorizer
-	// Backend is the backend used to store autoupdate resources.
+	// Backend is the backend used to store AutoUpdate resources.
 	Backend services.AutoUpdateService
-	// Cache is the cache used to store autoupdate resources.
+	// Cache is the cache used to store AutoUpdate resources.
 	Cache Cache
 }
 
-// Service implements the gRPC API layer for the Autoupdate.
+// Service implements the gRPC API layer for the AutoUpdate.
 type Service struct {
 	autoupdate.UnimplementedAutoUpdateServiceServer
 
@@ -58,7 +58,7 @@ type Service struct {
 	cache      Cache
 }
 
-// NewService returns a new Autoupdate API service using the given storage layer and authorizer.
+// NewService returns a new AutoUpdate API service using the given storage layer and authorizer.
 func NewService(cfg ServiceConfig) (*Service, error) {
 	switch {
 	case cfg.Backend == nil:
@@ -75,7 +75,7 @@ func NewService(cfg ServiceConfig) (*Service, error) {
 	}, nil
 }
 
-// GetAutoUpdateConfig gets the current autoupdate config singleton.
+// GetAutoUpdateConfig gets the current AutoUpdateConfig singleton.
 func (s *Service) GetAutoUpdateConfig(ctx context.Context, req *autoupdate.GetAutoUpdateConfigRequest) (*autoupdate.AutoUpdateConfig, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -94,7 +94,7 @@ func (s *Service) GetAutoUpdateConfig(ctx context.Context, req *autoupdate.GetAu
 	return config, nil
 }
 
-// CreateAutoUpdateConfig creates autoupdate config singleton.
+// CreateAutoUpdateConfig creates AutoUpdateConfig singleton.
 func (s *Service) CreateAutoUpdateConfig(ctx context.Context, req *autoupdate.CreateAutoUpdateConfigRequest) (*autoupdate.AutoUpdateConfig, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -113,7 +113,7 @@ func (s *Service) CreateAutoUpdateConfig(ctx context.Context, req *autoupdate.Cr
 	return config, trace.Wrap(err)
 }
 
-// UpdateAutoUpdateConfig updates autoupdate config singleton.
+// UpdateAutoUpdateConfig updates AutoUpdateConfig singleton.
 func (s *Service) UpdateAutoUpdateConfig(ctx context.Context, req *autoupdate.UpdateAutoUpdateConfigRequest) (*autoupdate.AutoUpdateConfig, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -132,7 +132,7 @@ func (s *Service) UpdateAutoUpdateConfig(ctx context.Context, req *autoupdate.Up
 	return config, trace.Wrap(err)
 }
 
-// UpsertAutoUpdateConfig updates or creates autoupdate config singleton.
+// UpsertAutoUpdateConfig updates or creates AutoUpdateConfig singleton.
 func (s *Service) UpsertAutoUpdateConfig(ctx context.Context, req *autoupdate.UpsertAutoUpdateConfigRequest) (*autoupdate.AutoUpdateConfig, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -151,7 +151,7 @@ func (s *Service) UpsertAutoUpdateConfig(ctx context.Context, req *autoupdate.Up
 	return config, trace.Wrap(err)
 }
 
-// DeleteAutoUpdateConfig deletes autoupdate config singleton.
+// DeleteAutoUpdateConfig deletes AutoUpdateConfig singleton.
 func (s *Service) DeleteAutoUpdateConfig(ctx context.Context, req *autoupdate.DeleteAutoUpdateConfigRequest) (*emptypb.Empty, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -172,7 +172,7 @@ func (s *Service) DeleteAutoUpdateConfig(ctx context.Context, req *autoupdate.De
 	return &emptypb.Empty{}, nil
 }
 
-// GetAutoUpdateVersion gets the current autoupdate version singleton.
+// GetAutoUpdateVersion gets the current AutoUpdateVersion singleton.
 func (s *Service) GetAutoUpdateVersion(ctx context.Context, req *autoupdate.GetAutoUpdateVersionRequest) (*autoupdate.AutoUpdateVersion, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -191,7 +191,7 @@ func (s *Service) GetAutoUpdateVersion(ctx context.Context, req *autoupdate.GetA
 	return version, nil
 }
 
-// CreateAutoUpdateVersion creates autoupdate version singleton.
+// CreateAutoUpdateVersion creates AutoUpdateVersion singleton.
 func (s *Service) CreateAutoUpdateVersion(ctx context.Context, req *autoupdate.CreateAutoUpdateVersionRequest) (*autoupdate.AutoUpdateVersion, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -210,7 +210,7 @@ func (s *Service) CreateAutoUpdateVersion(ctx context.Context, req *autoupdate.C
 	return autoUpdateVersion, trace.Wrap(err)
 }
 
-// UpdateAutoUpdateVersion updates autoupdate version singleton.
+// UpdateAutoUpdateVersion updates AutoUpdateVersion singleton.
 func (s *Service) UpdateAutoUpdateVersion(ctx context.Context, req *autoupdate.UpdateAutoUpdateVersionRequest) (*autoupdate.AutoUpdateVersion, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -229,7 +229,7 @@ func (s *Service) UpdateAutoUpdateVersion(ctx context.Context, req *autoupdate.U
 	return autoUpdateVersion, trace.Wrap(err)
 }
 
-// UpsertAutoUpdateVersion updates or creates autoupdate version singleton.
+// UpsertAutoUpdateVersion updates or creates AutoUpdateVersion singleton.
 func (s *Service) UpsertAutoUpdateVersion(ctx context.Context, req *autoupdate.UpsertAutoUpdateVersionRequest) (*autoupdate.AutoUpdateVersion, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {
@@ -248,7 +248,7 @@ func (s *Service) UpsertAutoUpdateVersion(ctx context.Context, req *autoupdate.U
 	return autoUpdateVersion, trace.Wrap(err)
 }
 
-// DeleteAutoUpdateVersion deletes autoupdate version singleton.
+// DeleteAutoUpdateVersion deletes AutoUpdateVersion singleton.
 func (s *Service) DeleteAutoUpdateVersion(ctx context.Context, req *autoupdate.DeleteAutoUpdateVersionRequest) (*emptypb.Empty, error) {
 	authCtx, err := s.authorizer.Authorize(ctx)
 	if err != nil {

lib/service/service.go

@@ -2574,7 +2574,7 @@ func (process *TeleportProcess) newAccessCacheForClient(cfg accesspoint.Config,
 	cfg.WebSession = client.WebSessions()
 	cfg.WebToken = client.WebTokens()
 	cfg.WindowsDesktops = client
-	cfg.AutoUpdateService = client.AutoUpdateServiceClient()
+	cfg.AutoUpdateService = client
 
 	return accesspoint.NewCache(cfg)
 }