Dependencies: Bump github.com/grafana/grafana-plugin-sdk-go from v0.197.0 to v0.198.0 (#79928)

* chore: Bump google.golang.org/grpc from 1.59.0 to 1.60.1

* Bump google.golang.org/protobuf to v1.32.0

* Fix make protobuf failing with latest protoc and protoc-gen-go

* Re-generate protobuf files

* Re-generate protobuf files

* Bump grafana-plugin-sdk-go

* go mod tidy

pkg/plugins/backendplugin/pluginextensionv2/generate.sh

@@ -13,4 +13,4 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 cd "$DIR"
 
-protoc -I ./ *.proto --go_out=plugins=grpc:./
+protoc -I ./ *.proto --go_out=. --go-grpc_out=.

pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go

@@ -1,16 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
+// 	protoc-gen-go v1.31.0
+// 	protoc        v4.25.1
 // source: rendererv2.proto
 
 package pluginextensionv2
 
 import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -609,119 +605,3 @@ func file_rendererv2_proto_init() {
 	file_rendererv2_proto_goTypes = nil
 	file_rendererv2_proto_depIdxs = nil
 }
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConnInterface
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion6
-
-// RendererClient is the client API for Renderer service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type RendererClient interface {
-	Render(ctx context.Context, in *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error)
-	RenderCSV(ctx context.Context, in *RenderCSVRequest, opts ...grpc.CallOption) (*RenderCSVResponse, error)
-}
-
-type rendererClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewRendererClient(cc grpc.ClientConnInterface) RendererClient {
-	return &rendererClient{cc}
-}
-
-func (c *rendererClient) Render(ctx context.Context, in *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error) {
-	out := new(RenderResponse)
-	err := c.cc.Invoke(ctx, "/pluginextensionv2.Renderer/Render", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *rendererClient) RenderCSV(ctx context.Context, in *RenderCSVRequest, opts ...grpc.CallOption) (*RenderCSVResponse, error) {
-	out := new(RenderCSVResponse)
-	err := c.cc.Invoke(ctx, "/pluginextensionv2.Renderer/RenderCSV", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// RendererServer is the server API for Renderer service.
-type RendererServer interface {
-	Render(context.Context, *RenderRequest) (*RenderResponse, error)
-	RenderCSV(context.Context, *RenderCSVRequest) (*RenderCSVResponse, error)
-}
-
-// UnimplementedRendererServer can be embedded to have forward compatible implementations.
-type UnimplementedRendererServer struct {
-}
-
-func (*UnimplementedRendererServer) Render(context.Context, *RenderRequest) (*RenderResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Render not implemented")
-}
-func (*UnimplementedRendererServer) RenderCSV(context.Context, *RenderCSVRequest) (*RenderCSVResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RenderCSV not implemented")
-}
-
-func RegisterRendererServer(s *grpc.Server, srv RendererServer) {
-	s.RegisterService(&_Renderer_serviceDesc, srv)
-}
-
-func _Renderer_Render_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RenderRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(RendererServer).Render(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pluginextensionv2.Renderer/Render",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RendererServer).Render(ctx, req.(*RenderRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Renderer_RenderCSV_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RenderCSVRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(RendererServer).RenderCSV(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pluginextensionv2.Renderer/RenderCSV",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RendererServer).RenderCSV(ctx, req.(*RenderCSVRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _Renderer_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "pluginextensionv2.Renderer",
-	HandlerType: (*RendererServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Render",
-			Handler:    _Renderer_Render_Handler,
-		},
-		{
-			MethodName: "RenderCSV",
-			Handler:    _Renderer_RenderCSV_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "rendererv2.proto",
-}

pkg/plugins/backendplugin/pluginextensionv2/rendererv2_grpc.pb.go

@@ -0,0 +1,146 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.3.0
+// - protoc             v4.25.1
+// source: rendererv2.proto
+
+package pluginextensionv2
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+const (
+	Renderer_Render_FullMethodName    = "/pluginextensionv2.Renderer/Render"
+	Renderer_RenderCSV_FullMethodName = "/pluginextensionv2.Renderer/RenderCSV"
+)
+
+// RendererClient is the client API for Renderer service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type RendererClient interface {
+	Render(ctx context.Context, in *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error)
+	RenderCSV(ctx context.Context, in *RenderCSVRequest, opts ...grpc.CallOption) (*RenderCSVResponse, error)
+}
+
+type rendererClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewRendererClient(cc grpc.ClientConnInterface) RendererClient {
+	return &rendererClient{cc}
+}
+
+func (c *rendererClient) Render(ctx context.Context, in *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error) {
+	out := new(RenderResponse)
+	err := c.cc.Invoke(ctx, Renderer_Render_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *rendererClient) RenderCSV(ctx context.Context, in *RenderCSVRequest, opts ...grpc.CallOption) (*RenderCSVResponse, error) {
+	out := new(RenderCSVResponse)
+	err := c.cc.Invoke(ctx, Renderer_RenderCSV_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// RendererServer is the server API for Renderer service.
+// All implementations must embed UnimplementedRendererServer
+// for forward compatibility
+type RendererServer interface {
+	Render(context.Context, *RenderRequest) (*RenderResponse, error)
+	RenderCSV(context.Context, *RenderCSVRequest) (*RenderCSVResponse, error)
+	mustEmbedUnimplementedRendererServer()
+}
+
+// UnimplementedRendererServer must be embedded to have forward compatible implementations.
+type UnimplementedRendererServer struct {
+}
+
+func (UnimplementedRendererServer) Render(context.Context, *RenderRequest) (*RenderResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Render not implemented")
+}
+func (UnimplementedRendererServer) RenderCSV(context.Context, *RenderCSVRequest) (*RenderCSVResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RenderCSV not implemented")
+}
+func (UnimplementedRendererServer) mustEmbedUnimplementedRendererServer() {}
+
+// UnsafeRendererServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to RendererServer will
+// result in compilation errors.
+type UnsafeRendererServer interface {
+	mustEmbedUnimplementedRendererServer()
+}
+
+func RegisterRendererServer(s grpc.ServiceRegistrar, srv RendererServer) {
+	s.RegisterService(&Renderer_ServiceDesc, srv)
+}
+
+func _Renderer_Render_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RenderRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(RendererServer).Render(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Renderer_Render_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RendererServer).Render(ctx, req.(*RenderRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Renderer_RenderCSV_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RenderCSVRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(RendererServer).RenderCSV(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Renderer_RenderCSV_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RendererServer).RenderCSV(ctx, req.(*RenderCSVRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// Renderer_ServiceDesc is the grpc.ServiceDesc for Renderer service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Renderer_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "pluginextensionv2.Renderer",
+	HandlerType: (*RendererServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Render",
+			Handler:    _Renderer_Render_Handler,
+		},
+		{
+			MethodName: "RenderCSV",
+			Handler:    _Renderer_RenderCSV_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "rendererv2.proto",
+}

pkg/plugins/backendplugin/pluginextensionv2/sanitizer.pb.go

@@ -1,16 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
+// 	protoc-gen-go v1.31.0
+// 	protoc        v4.25.1
 // source: sanitizer.proto
 
 package pluginextensionv2
 
 import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -255,83 +251,3 @@ func file_sanitizer_proto_init() {
 	file_sanitizer_proto_goTypes = nil
 	file_sanitizer_proto_depIdxs = nil
 }
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
-var _ grpc.ClientConnInterface
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion6
-
-// SanitizerClient is the client API for Sanitizer service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
-type SanitizerClient interface {
-	Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error)
-}
-
-type sanitizerClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewSanitizerClient(cc grpc.ClientConnInterface) SanitizerClient {
-	return &sanitizerClient{cc}
-}
-
-func (c *sanitizerClient) Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error) {
-	out := new(SanitizeResponse)
-	err := c.cc.Invoke(ctx, "/pluginextensionv2.Sanitizer/Sanitize", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// SanitizerServer is the server API for Sanitizer service.
-type SanitizerServer interface {
-	Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error)
-}
-
-// UnimplementedSanitizerServer can be embedded to have forward compatible implementations.
-type UnimplementedSanitizerServer struct {
-}
-
-func (*UnimplementedSanitizerServer) Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Sanitize not implemented")
-}
-
-func RegisterSanitizerServer(s *grpc.Server, srv SanitizerServer) {
-	s.RegisterService(&_Sanitizer_serviceDesc, srv)
-}
-
-func _Sanitizer_Sanitize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SanitizeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(SanitizerServer).Sanitize(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/pluginextensionv2.Sanitizer/Sanitize",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(SanitizerServer).Sanitize(ctx, req.(*SanitizeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-var _Sanitizer_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "pluginextensionv2.Sanitizer",
-	HandlerType: (*SanitizerServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "Sanitize",
-			Handler:    _Sanitizer_Sanitize_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "sanitizer.proto",
-}

pkg/plugins/backendplugin/pluginextensionv2/sanitizer_grpc.pb.go

@@ -0,0 +1,109 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.3.0
+// - protoc             v4.25.1
+// source: sanitizer.proto
+
+package pluginextensionv2
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+const (
+	Sanitizer_Sanitize_FullMethodName = "/pluginextensionv2.Sanitizer/Sanitize"
+)
+
+// SanitizerClient is the client API for Sanitizer service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type SanitizerClient interface {
+	Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error)
+}
+
+type sanitizerClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewSanitizerClient(cc grpc.ClientConnInterface) SanitizerClient {
+	return &sanitizerClient{cc}
+}
+
+func (c *sanitizerClient) Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error) {
+	out := new(SanitizeResponse)
+	err := c.cc.Invoke(ctx, Sanitizer_Sanitize_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// SanitizerServer is the server API for Sanitizer service.
+// All implementations must embed UnimplementedSanitizerServer
+// for forward compatibility
+type SanitizerServer interface {
+	Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error)
+	mustEmbedUnimplementedSanitizerServer()
+}
+
+// UnimplementedSanitizerServer must be embedded to have forward compatible implementations.
+type UnimplementedSanitizerServer struct {
+}
+
+func (UnimplementedSanitizerServer) Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Sanitize not implemented")
+}
+func (UnimplementedSanitizerServer) mustEmbedUnimplementedSanitizerServer() {}
+
+// UnsafeSanitizerServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to SanitizerServer will
+// result in compilation errors.
+type UnsafeSanitizerServer interface {
+	mustEmbedUnimplementedSanitizerServer()
+}
+
+func RegisterSanitizerServer(s grpc.ServiceRegistrar, srv SanitizerServer) {
+	s.RegisterService(&Sanitizer_ServiceDesc, srv)
+}
+
+func _Sanitizer_Sanitize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SanitizeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SanitizerServer).Sanitize(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Sanitizer_Sanitize_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SanitizerServer).Sanitize(ctx, req.(*SanitizeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// Sanitizer_ServiceDesc is the grpc.ServiceDesc for Sanitizer service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Sanitizer_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "pluginextensionv2.Sanitizer",
+	HandlerType: (*SanitizerServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Sanitize",
+			Handler:    _Sanitizer_Sanitize_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "sanitizer.proto",
+}

pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
+// 	protoc-gen-go v1.31.0
+// 	protoc        v4.25.1
 // source: secretsmanager.proto
 
 package secretsmanagerplugin

pkg/plugins/backendplugin/secretsmanagerplugin/secretsmanager_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.3.0
-// - protoc             v4.23.4
+// - protoc             v4.25.1
 // source: secretsmanager.proto
 
 package secretsmanagerplugin