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

refactor extensions -> services

Browse Source 
Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2022-06-27 14:05:36 +02:00
parent 78064e6bab
commit f8f1320501
612 changed files with 1080 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/search/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/search/pkg/logging"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/search/pkg/logging"
"github.com/urfave/cli/v2"
)
services/search/pkg/command/index.go
+2 -2
View File
@@ -6,10 +6,10 @@ import (
"github.com/urfave/cli/v2"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/config/parser"
)
// Index is the entrypoint for the server command.
services/search/pkg/command/root.go
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
"github.com/thejerf/suture/v4"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/urfave/cli/v2"
)
services/search/pkg/command/server.go
+7 -7
View File
@@ -6,14 +6,14 @@ import (
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/search/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/search/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/search/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/search/pkg/server/grpc"
"github.com/owncloud/ocis/v2/extensions/search/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/search/pkg/logging"
"github.com/owncloud/ocis/v2/services/search/pkg/metrics"
"github.com/owncloud/ocis/v2/services/search/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/search/pkg/server/grpc"
"github.com/owncloud/ocis/v2/services/search/pkg/tracing"
"github.com/urfave/cli/v2"
)
services/search/pkg/command/version.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/urfave/cli/v2"
)
services/search/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -3,8 +3,8 @@ package defaults
import (
"path"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
)
func FullDefaultConfig() *config.Config {
services/search/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,10 +3,10 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
services/search/pkg/logging/logging.go
+1 -1
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
)
// LoggerFromConfig initializes a service-specific logger instance.
services/search/pkg/search/index/index_test.go
+1 -1
View File
@@ -6,9 +6,9 @@ import (
"github.com/blevesearch/bleve/v2"
sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
"github.com/owncloud/ocis/v2/extensions/search/pkg/search/index"
searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0"
searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0"
"github.com/owncloud/ocis/v2/services/search/pkg/search/index"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
services/search/pkg/search/provider/events_test.go
+2 -2
View File
@@ -13,9 +13,9 @@ import (
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/rgrpc/status"
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
"github.com/owncloud/ocis/v2/extensions/search/pkg/search/mocks"
provider "github.com/owncloud/ocis/v2/extensions/search/pkg/search/provider"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/search/pkg/search/mocks"
provider "github.com/owncloud/ocis/v2/services/search/pkg/search/provider"
)
var _ = Describe("Searchprovider", func() {
services/search/pkg/search/provider/searchprovider.go
+1 -1
View File
@@ -19,8 +19,8 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/walker"
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/v2/extensions/search/pkg/search"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/search/pkg/search"
"google.golang.org/grpc/metadata"
searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0"
services/search/pkg/search/provider/searchprovider_test.go
+2 -2
View File
@@ -13,11 +13,11 @@ import (
typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
"github.com/cs3org/reva/v2/pkg/rgrpc/status"
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
"github.com/owncloud/ocis/v2/extensions/search/pkg/search/mocks"
provider "github.com/owncloud/ocis/v2/extensions/search/pkg/search/provider"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0"
searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0"
"github.com/owncloud/ocis/v2/services/search/pkg/search/mocks"
provider "github.com/owncloud/ocis/v2/services/search/pkg/search/provider"
)
var _ = Describe("Searchprovider", func() {
services/search/pkg/server/debug/option.go
+1 -1
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
)
// Option defines a single option function.
services/search/pkg/server/debug/server.go
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
)
// Server initializes the debug service and server.
services/search/pkg/server/grpc/option.go
+3 -3
View File
@@ -3,10 +3,10 @@ package grpc
import (
"context"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/extensions/search/pkg/metrics"
svc "github.com/owncloud/ocis/v2/extensions/search/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/metrics"
svc "github.com/owncloud/ocis/v2/services/search/pkg/service/v0"
"github.com/urfave/cli/v2"
)
services/search/pkg/server/grpc/server.go
+1 -1
View File
@@ -1,10 +1,10 @@
package grpc
import (
svc "github.com/owncloud/ocis/v2/extensions/search/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0"
svc "github.com/owncloud/ocis/v2/services/search/pkg/service/v0"
)
// Server initializes a new go-micro service ready to run
services/search/pkg/service/v0/option.go
+1 -1
View File
@@ -1,8 +1,8 @@
package service
import (
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
)
// Option defines a single option function.
services/search/pkg/service/v0/service.go
+4 -4
View File
@@ -14,12 +14,12 @@ import (
"go-micro.dev/v4/metadata"
grpcmetadata "google.golang.org/grpc/metadata"
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
"github.com/owncloud/ocis/v2/extensions/search/pkg/search"
"github.com/owncloud/ocis/v2/extensions/search/pkg/search/index"
searchprovider "github.com/owncloud/ocis/v2/extensions/search/pkg/search/provider"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/search"
"github.com/owncloud/ocis/v2/services/search/pkg/search/index"
searchprovider "github.com/owncloud/ocis/v2/services/search/pkg/search/provider"
)
// NewHandler returns a service implementation for Service.
services/search/pkg/tracing/tracing.go
+1 -1
View File
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/v2/extensions/search/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/services/search/pkg/config"
"go.opentelemetry.io/otel/trace"
)