update command

backend/admission_adapter.go

@@ -11,7 +11,7 @@ type admissionSDKAdapter struct {
 	handler AdmissionHandler
 }
 
-func newStorageSDKAdapter(handler AdmissionHandler) *admissionSDKAdapter {
+func newAdmissionSDKAdapter(handler AdmissionHandler) *admissionSDKAdapter {
 	return &admissionSDKAdapter{
 		handler: handler,
 	}

backend/app/manage.go

@@ -48,6 +48,7 @@ func Manage(pluginID string, instanceFactory InstanceFactoryFunc, opts ManageOpt
 		QueryDataHandler:    handler,
 		StreamHandler:       handler,
 		AdmissionHandler:    opts.Stateless.AdmissionHandler,
-		GRPCSettings:        opts.GRPCSettings,
+		//		CollectMetricsHandler: opts.Stateless. ?? is this managed elsewhere?
+		GRPCSettings: opts.GRPCSettings,
 	})
 }

backend/datasource/serve.go

@@ -21,7 +21,7 @@ type ServeOpts struct {
 	// StreamHandler for streaming queries.
 	backend.StreamHandler
 
-	// AdmissionHandler for processing instance settings
+	// AdmissionHandler for processing storage requests
 	backend.AdmissionHandler
 
 	// GRPCSettings settings for gPRC.

backend/grpcplugin/grpc_admission.go

@@ -9,12 +9,12 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/genproto/pluginv2"
 )
 
-// AdmissionServer represents a data server.
+// AdmissionServer represents an admission control server.
 type AdmissionServer interface {
 	pluginv2.AdmissionControlServer
 }
 
-// AdmissionClient represents a data client.
+// AdmissionClient represents an admission control client.
 type AdmissionClient interface {
 	pluginv2.AdmissionControlClient
 }
@@ -26,15 +26,14 @@ type StorageGRPCPlugin struct {
 	AdmissionServer AdmissionServer
 }
 
-// GRPCServer registers p as a data gRPC server.
+// GRPCServer registers p as an admission control gRPC server.
 func (p *StorageGRPCPlugin) GRPCServer(_ *plugin.GRPCBroker, s *grpc.Server) error {
 	pluginv2.RegisterAdmissionControlServer(s, &storageGRPCServer{
 		server: p.AdmissionServer,
 	})
 	return nil
 }
 
-// GRPCClient returns c as a data gRPC client.
 func (p *StorageGRPCPlugin) GRPCClient(_ context.Context, _ *plugin.GRPCBroker, c *grpc.ClientConn) (interface{}, error) {
 	return &storageGRPCClient{client: pluginv2.NewAdmissionControlClient(c)}, nil
 }

backend/serve.go

@@ -79,7 +79,7 @@ func GRPCServeOpts(opts ServeOpts) grpcplugin.ServeOpts {
 	}
 
 	if opts.AdmissionHandler != nil {
-		pluginOpts.AdmissionServer = newStorageSDKAdapter(opts.AdmissionHandler)
+		pluginOpts.AdmissionServer = newAdmissionSDKAdapter(opts.AdmissionHandler)
 	}
 	return pluginOpts
 }

internal/automanagement/manager.go

@@ -18,19 +18,10 @@ type Manager struct {
 	instancemgmt.InstanceManager
 }
 
-var (
-	_ = backend.CollectMetricsHandler(&Manager{})
-	_ = backend.CheckHealthHandler(&Manager{})
-	_ = backend.QueryDataHandler(&Manager{})
-	_ = backend.CallResourceHandler(&Manager{})
-	_ = backend.StreamHandler(&Manager{})
-)
-
-// NewManager creates Manager. It accepts datasource instance factory.
+// NewManager creates Manager. It accepts datasource
+// instance factory.
 func NewManager(instanceManager instancemgmt.InstanceManager) *Manager {
-	return &Manager{
-		InstanceManager: instanceManager,
-	}
+	return &Manager{InstanceManager: instanceManager}
 }
 
 func (m *Manager) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
@@ -58,17 +49,6 @@ func (m *Manager) CheckHealth(ctx context.Context, req *backend.CheckHealthReque
 	return nil, status.Error(codes.Unimplemented, "unimplemented")
 }
 
-func (m *Manager) CollectMetrics(ctx context.Context, req *backend.CollectMetricsRequest) (*backend.CollectMetricsResult, error) {
-	h, err := m.Get(ctx, req.PluginContext)
-	if err != nil {
-		return nil, err
-	}
-	if ds, ok := h.(backend.CollectMetricsHandler); ok {
-		return ds.CollectMetrics(ctx, req)
-	}
-	return nil, status.Error(codes.Unimplemented, "unimplemented")
-}
-
 func (m *Manager) CallResource(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	h, err := m.Get(ctx, req.PluginContext)
 	if err != nil {