sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use plain pkg module

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2025-01-13 16:42:19 +01:00
committed by Florian Schade
parent 259cbc2e56
commit b07b5a1149
841 changed files with 1383 additions and 1366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/search/pkg/command/index.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/urfave/cli/v2"
"go-micro.dev/v4/client"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
"github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
"github.com/opencloud-eu/opencloud/pkg/config/configlog"
"github.com/opencloud-eu/opencloud/pkg/service/grpc"
"github.com/opencloud-eu/opencloud/pkg/tracing"
searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/opencloud-eu/opencloud/services/search/pkg/config/parser"
services/search/pkg/command/root.go
+1 -1
View File
@@ -3,7 +3,7 @@ package command
import (
"os"
"github.com/opencloud-eu/opencloud/ocis-pkg/clihelper"
"github.com/opencloud-eu/opencloud/pkg/clihelper"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/urfave/cli/v2"
services/search/pkg/command/server.go
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"fmt"
"github.com/oklog/run"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
"github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/pkg/config/configlog"
ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc"
"github.com/opencloud-eu/opencloud/pkg/tracing"
"github.com/opencloud-eu/opencloud/pkg/version"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/opencloud-eu/opencloud/services/search/pkg/config/parser"
"github.com/opencloud-eu/opencloud/services/search/pkg/logging"
services/search/pkg/command/version.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"os"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/pkg/registry"
"github.com/opencloud-eu/opencloud/pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
services/search/pkg/config/config.go
+1 -1
View File
@@ -3,7 +3,7 @@ package config
import (
"context"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
"go-micro.dev/v4/client"
)
services/search/pkg/config/defaults/defaultconfig.go
+3 -3
View File
@@ -3,9 +3,9 @@ package defaults
import (
"path/filepath"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/ocis-pkg/structs"
"github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/structs"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
)
services/search/pkg/config/grpc.go
+1 -1
View File
@@ -1,6 +1,6 @@
package config
import "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
import "github.com/opencloud-eu/opencloud/pkg/shared"
// GRPCConfig defines the available grpc configuration.
type GRPCConfig struct {
services/search/pkg/config/parser/parse.go
+3 -3
View File
@@ -3,12 +3,12 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.
services/search/pkg/config/tracing.go
+1 -1
View File
@@ -1,6 +1,6 @@
package config
import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
import "github.com/opencloud-eu/opencloud/pkg/tracing"
// Tracing defines the available tracing configuration.
type Tracing struct {
services/search/pkg/content/basic.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
storageProvider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
"github.com/cs3org/reva/v2/pkg/tags"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
)
// Basic is the simplest Extractor implementation.
services/search/pkg/content/basic_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
cs3Types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/search/pkg/content"
)
services/search/pkg/content/cs3.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
)
type cs3 struct {
services/search/pkg/content/tika.go
+2 -2
View File
@@ -13,9 +13,9 @@ import (
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/google/go-tika/tika"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
libregraph "github.com/owncloud/libre-graph-api-go"
)
// Tika is used to extract content from a resource,
services/search/pkg/content/tika_test.go
+2 -2
View File
@@ -14,11 +14,11 @@ import (
. "github.com/onsi/gomega"
"github.com/stretchr/testify/mock"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
conf "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/search/pkg/content"
contentMocks "github.com/opencloud-eu/opencloud/services/search/pkg/content/mocks"
libregraph "github.com/owncloud/libre-graph-api-go"
)
var _ = Describe("Tika", func() {
services/search/pkg/logging/logging.go
+1 -1
View File
@@ -1,7 +1,7 @@
package logging
import (
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
)
services/search/pkg/query/bleve/bleve.go
+1 -1
View File
@@ -4,7 +4,7 @@ package bleve
import (
bQuery "github.com/blevesearch/bleve/v2/search/query"
"github.com/opencloud-eu/opencloud/ocis-pkg/kql"
"github.com/opencloud-eu/opencloud/pkg/kql"
"github.com/opencloud-eu/opencloud/services/search/pkg/query"
)
services/search/pkg/query/bleve/compiler.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/blevesearch/bleve/v2"
bleveQuery "github.com/blevesearch/bleve/v2/search/query"
"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
"github.com/opencloud-eu/opencloud/ocis-pkg/kql"
"github.com/opencloud-eu/opencloud/pkg/ast"
"github.com/opencloud-eu/opencloud/pkg/kql"
)
var _fields = map[string]string{
services/search/pkg/query/bleve/compiler_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"time"
"github.com/blevesearch/bleve/v2/search/query"
"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
"github.com/opencloud-eu/opencloud/pkg/ast"
tAssert "github.com/stretchr/testify/assert"
)
services/search/pkg/query/error.go
+1 -1
View File
@@ -3,7 +3,7 @@ package query
import (
"fmt"
"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
"github.com/opencloud-eu/opencloud/pkg/ast"
)
// StartsWithBinaryOperatorError records an error and the operation that caused it.
services/search/pkg/query/query.go
+1 -1
View File
@@ -1,7 +1,7 @@
// Package query provides functions to work with the different search query flavours.
package query
import "github.com/opencloud-eu/opencloud/ocis-pkg/ast"
import "github.com/opencloud-eu/opencloud/pkg/ast"
// Builder is the interface that wraps the basic Build method.
type Builder interface {
services/search/pkg/search/events.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
)
services/search/pkg/search/events_test.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/cs3org/reva/v2/pkg/events"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/opencloud-eu/opencloud/services/search/pkg/search"
searchMocks "github.com/opencloud-eu/opencloud/services/search/pkg/search/mocks"
services/search/pkg/search/search.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/grants"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
searchmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0"
"github.com/opencloud-eu/opencloud/services/search/pkg/engine"
)
services/search/pkg/search/search_suite_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package search_test
import (
"testing"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/pkg/registry"
mRegistry "go-micro.dev/v4/registry"
. "github.com/onsi/ginkgo/v2"
services/search/pkg/search/service.go
+2 -2
View File
@@ -24,13 +24,13 @@ import (
"golang.org/x/sync/errgroup"
"google.golang.org/protobuf/types/known/fieldmaskpb"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
searchmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0"
searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/opencloud-eu/opencloud/services/search/pkg/content"
"github.com/opencloud-eu/opencloud/services/search/pkg/engine"
libregraph "github.com/owncloud/libre-graph-api-go"
)
const (
services/search/pkg/search/service_test.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
searchmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0"
searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
services/search/pkg/server/debug/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package debug
import (
"context"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
)
services/search/pkg/server/debug/server.go
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"context"
"net/http"
"github.com/opencloud-eu/opencloud/ocis-pkg/checks"
"github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
"github.com/opencloud-eu/opencloud/ocis-pkg/service/debug"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/pkg/checks"
"github.com/opencloud-eu/opencloud/pkg/handlers"
"github.com/opencloud-eu/opencloud/pkg/service/debug"
"github.com/opencloud-eu/opencloud/pkg/version"
)
// Server initializes the debug service and server.
services/search/pkg/server/grpc/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package grpc
import (
"context"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/opencloud-eu/opencloud/services/search/pkg/metrics"
svc "github.com/opencloud-eu/opencloud/services/search/pkg/service/grpc/v0"
services/search/pkg/server/grpc/server.go
+2 -2
View File
@@ -1,8 +1,8 @@
package grpc
import (
"github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/pkg/service/grpc"
"github.com/opencloud-eu/opencloud/pkg/version"
searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
svc "github.com/opencloud-eu/opencloud/services/search/pkg/service/grpc/v0"
)
services/search/pkg/service/grpc/v0/option.go
+1 -1
View File
@@ -1,7 +1,7 @@
package service
import (
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"go.opentelemetry.io/otel/trace"
)
services/search/pkg/service/grpc/v0/service.go
+2 -2
View File
@@ -22,8 +22,8 @@ import (
"go-micro.dev/v4/metadata"
grpcmetadata "google.golang.org/grpc/metadata"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/registry"
v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0"
searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"