Skip to content

Commit

Permalink
Fix mock generation
Browse files Browse the repository at this point in the history
  • Loading branch information
@aduffeck
aduffeck committed Feb 2, 2024
1 parent 068a8b8 commit d28d673
Show file tree
Hide file tree
Showing 11 changed files with 112 additions and 11 deletions.
102 changes: 102 additions & 0 deletions pkg/storage/fs/posix/tree/mocks/Blobstore.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions pkg/storage/utils/decomposedfs/decomposedfs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@

package decomposedfs

//go:generate make --no-print-directory -C ../../../.. mockery NAME=PermissionsChecker
//go:generate make --no-print-directory -C ../../../.. mockery NAME=CS3PermissionsClient
//go:generate make --no-print-directory -C ../../../.. mockery NAME=Tree

import (
"context"
"fmt"
Expand Down
1 change: 0 additions & 1 deletion pkg/storage/utils/decomposedfs/mocks/Tree.go → ...age/utils/decomposedfs/node/mocks/Tree.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/storage/utils/decomposedfs/node/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ import (
"go.opentelemetry.io/otel/trace"
)

//go:generate make --no-print-directory -C ../../../../.. mockery NAME=Tree

var tracer trace.Tracer

func init() {
Expand Down
0 ...ecomposedfs/mocks/CS3PermissionsClient.go → ...permissions/mocks/CS3PermissionsClient.go
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions .../decomposedfs/mocks/PermissionsChecker.go → ...s/permissions/mocks/PermissionsChecker.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions pkg/storage/utils/decomposedfs/permissions/spacepermissions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import (
"google.golang.org/grpc"
)

//go:generate make --no-print-directory -C ../../../../.. mockery NAME=PermissionsChecker
//go:generate make --no-print-directory -C ../../../../.. mockery NAME=CS3PermissionsClient

var (
tracer trace.Tracer
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/utils/decomposedfs/recycle_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
ctxpkg "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/mocks"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/permissions/mocks"
helpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/utils/decomposedfs/testhelpers/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ import (
providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
ruser "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/mocks"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/permissions/mocks"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree"
treemocks "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree/mocks"
"github.com/cs3org/reva/v2/tests/helpers"
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/utils/decomposedfs/upload_async_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/aspects"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/metadata"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/mocks"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/permissions"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/permissions/mocks"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree"
treemocks "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree/mocks"
"github.com/cs3org/reva/v2/pkg/storagespace"
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/utils/decomposedfs/upload_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/metadata"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/metadata/prefixes"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/mocks"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/permissions"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/permissions/mocks"
"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree"
treemocks "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree/mocks"
"github.com/cs3org/reva/v2/pkg/storagespace"
Expand Down

0 comments on commit d28d673

Please sign in to comment.