public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(unified-storage): move generated protos to own pkg (#105356)

Browse Source
This commit is contained in:
Jean-Philippe Quéméner
2025-05-15 21:36:52 +02:00
committed by GitHub
parent aa2cf8e398
commit 002f46736a
150 changed files with 4284 additions and 3863 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/provisioning/webhooks/pullrequest/blobstore_client_mock.go
+11 -11
View File
@@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock"
resource "github.com/grafana/grafana/pkg/storage/unified/resource"
"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
)
// MockBlobStoreClient is an autogenerated mock type for the BlobStoreClient type
@@ -26,7 +26,7 @@ func (_m *MockBlobStoreClient) EXPECT() *MockBlobStoreClient_Expecter {
}
// PutBlob provides a mock function with given fields: ctx, in, opts
func (_m *MockBlobStoreClient) PutBlob(ctx context.Context, in *resource.PutBlobRequest, opts ...grpc.CallOption) (*resource.PutBlobResponse, error) {
func (_m *MockBlobStoreClient) PutBlob(ctx context.Context, in *resourcepb.PutBlobRequest, opts ...grpc.CallOption) (*resourcepb.PutBlobResponse, error) {
_va := make([]interface{}, len(opts))
for _i := range opts {
_va[_i] = opts[_i]
@@ -40,20 +40,20 @@ func (_m *MockBlobStoreClient) PutBlob(ctx context.Context, in *resource.PutBlob
panic("no return value specified for PutBlob")
}
var r0 *resource.PutBlobResponse
var r0 *resourcepb.PutBlobResponse
var r1 error
if rf, ok := ret.Get(0).(func(context.Context, *resource.PutBlobRequest, ...grpc.CallOption) (*resource.PutBlobResponse, error)); ok {
if rf, ok := ret.Get(0).(func(context.Context, *resourcepb.PutBlobRequest, ...grpc.CallOption) (*resourcepb.PutBlobResponse, error)); ok {
return rf(ctx, in, opts...)
}
if rf, ok := ret.Get(0).(func(context.Context, *resource.PutBlobRequest, ...grpc.CallOption) *resource.PutBlobResponse); ok {
if rf, ok := ret.Get(0).(func(context.Context, *resourcepb.PutBlobRequest, ...grpc.CallOption) *resourcepb.PutBlobResponse); ok {
r0 = rf(ctx, in, opts...)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*resource.PutBlobResponse)
r0 = ret.Get(0).(*resourcepb.PutBlobResponse)
}
}
if rf, ok := ret.Get(1).(func(context.Context, *resource.PutBlobRequest, ...grpc.CallOption) error); ok {
if rf, ok := ret.Get(1).(func(context.Context, *resourcepb.PutBlobRequest, ...grpc.CallOption) error); ok {
r1 = rf(ctx, in, opts...)
} else {
r1 = ret.Error(1)
@@ -76,7 +76,7 @@ func (_e *MockBlobStoreClient_Expecter) PutBlob(ctx interface{}, in interface{},
append([]interface{}{ctx, in}, opts...)...)}
}
func (_c *MockBlobStoreClient_PutBlob_Call) Run(run func(ctx context.Context, in *resource.PutBlobRequest, opts ...grpc.CallOption)) *MockBlobStoreClient_PutBlob_Call {
func (_c *MockBlobStoreClient_PutBlob_Call) Run(run func(ctx context.Context, in *resourcepb.PutBlobRequest, opts ...grpc.CallOption)) *MockBlobStoreClient_PutBlob_Call {
_c.Call.Run(func(args mock.Arguments) {
variadicArgs := make([]grpc.CallOption, len(args)-2)
for i, a := range args[2:] {
@@ -84,17 +84,17 @@ func (_c *MockBlobStoreClient_PutBlob_Call) Run(run func(ctx context.Context, in
variadicArgs[i] = a.(grpc.CallOption)
}
}
run(args[0].(context.Context), args[1].(*resource.PutBlobRequest), variadicArgs...)
run(args[0].(context.Context), args[1].(*resourcepb.PutBlobRequest), variadicArgs...)
})
return _c
}
func (_c *MockBlobStoreClient_PutBlob_Call) Return(_a0 *resource.PutBlobResponse, _a1 error) *MockBlobStoreClient_PutBlob_Call {
func (_c *MockBlobStoreClient_PutBlob_Call) Return(_a0 *resourcepb.PutBlobResponse, _a1 error) *MockBlobStoreClient_PutBlob_Call {
_c.Call.Return(_a0, _a1)
return _c
}
func (_c *MockBlobStoreClient_PutBlob_Call) RunAndReturn(run func(context.Context, *resource.PutBlobRequest, ...grpc.CallOption) (*resource.PutBlobResponse, error)) *MockBlobStoreClient_PutBlob_Call {
func (_c *MockBlobStoreClient_PutBlob_Call) RunAndReturn(run func(context.Context, *resourcepb.PutBlobRequest, ...grpc.CallOption) (*resourcepb.PutBlobResponse, error)) *MockBlobStoreClient_PutBlob_Call {
_c.Call.Return(run)
return _c
}
pkg/registry/apis/provisioning/webhooks/pullrequest/render.go
+6 -5
View File
@@ -14,13 +14,14 @@ import (
provisioning "github.com/grafana/grafana/pkg/apis/provisioning/v0alpha1"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/storage/unified/resource"
"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
"google.golang.org/grpc"
)
//go:generate mockery --name BlobStoreClient --structname MockBlobStoreClient --inpackage --filename blobstore_client_mock.go --with-expecter
type BlobStoreClient interface {
PutBlob(ctx context.Context, in *resource.PutBlobRequest, opts ...grpc.CallOption) (*resource.PutBlobResponse, error)
PutBlob(ctx context.Context, in *resourcepb.PutBlobRequest, opts ...grpc.CallOption) (*resourcepb.PutBlobResponse, error)
}
// ScreenshotRenderer is an interface for rendering a preview of a file
@@ -85,14 +86,14 @@ func (r *screenshotRenderer) RenderScreenshot(ctx context.Context, repo provisio
return "", err
}
rsp, err := r.blobstore.PutBlob(ctx, &resource.PutBlobRequest{
Resource: &resource.ResourceKey{
rsp, err := r.blobstore.PutBlob(ctx, &resourcepb.PutBlobRequest{
Resource: &resourcepb.ResourceKey{
Namespace: repo.Namespace,
Group: provisioning.GROUP,
Resource: provisioning.RepositoryResourceInfo.GroupResource().Resource,
Name: repo.Name,
},
Method: resource.PutBlobRequest_GRPC,
Method: resourcepb.PutBlobRequest_GRPC,
ContentType: mime.TypeByExtension(ext), // image/png
Value: body,
})
pkg/registry/apis/provisioning/webhooks/pullrequest/render_test.go
+6 -6
View File
@@ -15,7 +15,7 @@ import (
provisioning "github.com/grafana/grafana/pkg/apis/provisioning/v0alpha1"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/storage/unified/resource"
"github.com/grafana/grafana/pkg/storage/unified/resourcepb"
)
func setupTempFile(t *testing.T) (string, func()) {
@@ -170,10 +170,10 @@ func TestScreenshotRenderer_RenderScreenshot(t *testing.T) {
},
setupBlobstore: func(t *testing.T) BlobStoreClient {
blobstore := NewMockBlobStoreClient(t)
blobstore.On("PutBlob", mock.Anything, mock.MatchedBy(func(req *resource.PutBlobRequest) bool {
blobstore.On("PutBlob", mock.Anything, mock.MatchedBy(func(req *resourcepb.PutBlobRequest) bool {
return req.Resource.Group == provisioning.GROUP &&
req.Resource.Resource == provisioning.RepositoryResourceInfo.GroupResource().Resource &&
req.Method == resource.PutBlobRequest_GRPC &&
req.Method == resourcepb.PutBlobRequest_GRPC &&
req.ContentType == "image/png"
})).Return(nil, errors.New("blobstore error"))
return blobstore
@@ -200,7 +200,7 @@ func TestScreenshotRenderer_RenderScreenshot(t *testing.T) {
setupBlobstore: func(t *testing.T) BlobStoreClient {
blobstore := NewMockBlobStoreClient(t)
blobstore.On("PutBlob", mock.Anything, mock.Anything).
Return(&resource.PutBlobResponse{
Return(&resourcepb.PutBlobResponse{
Url: "https://example.com/test.png",
}, nil)
return blobstore
@@ -227,7 +227,7 @@ func TestScreenshotRenderer_RenderScreenshot(t *testing.T) {
setupBlobstore: func(t *testing.T) BlobStoreClient {
blobstore := NewMockBlobStoreClient(t)
blobstore.On("PutBlob", mock.Anything, mock.Anything).
Return(&resource.PutBlobResponse{
Return(&resourcepb.PutBlobResponse{
Uid: "test-uid",
}, nil)
return blobstore
@@ -257,7 +257,7 @@ func TestScreenshotRenderer_RenderScreenshot(t *testing.T) {
setupBlobstore: func(t *testing.T) BlobStoreClient {
blobstore := NewMockBlobStoreClient(t)
blobstore.On("PutBlob", mock.Anything, mock.Anything).
Return(&resource.PutBlobResponse{
Return(&resourcepb.PutBlobResponse{
Uid: "test-uid",
}, nil)
return blobstore