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/settings/cmd/settings/main.go
+2 -2
View File
@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/command"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults"
"github.com/owncloud/ocis/v2/services/settings/pkg/command"
"github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults"
)
func main() {
services/settings/pkg/assets/option.go
+2 -2
View File
@@ -3,10 +3,10 @@ package assets
import (
"net/http"
"github.com/owncloud/ocis/v2/extensions/settings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/settings"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
)
// New returns a new http filesystem to serve assets.
services/settings/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/logging"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/settings/pkg/logging"
"github.com/urfave/cli/v2"
)
services/settings/pkg/command/root.go
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)
services/settings/pkg/command/server.go
+8 -8
View File
@@ -6,15 +6,15 @@ import (
"os"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/server/grpc"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/settings/pkg/logging"
"github.com/owncloud/ocis/v2/services/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/services/settings/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/settings/pkg/server/grpc"
"github.com/owncloud/ocis/v2/services/settings/pkg/server/http"
"github.com/owncloud/ocis/v2/services/settings/pkg/tracing"
"github.com/urfave/cli/v2"
)
services/settings/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/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/urfave/cli/v2"
)
services/settings/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"path"
"strings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
)
func FullDefaultConfig() *config.Config {
services/settings/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,10 +3,10 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/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/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
services/settings/pkg/logging/logging.go
+1 -1
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
)
// LoggerFromConfig initializes a service-specific logger instance.
services/settings/pkg/server/debug/option.go
+1 -1
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
)
// Option defines a single option function.
services/settings/pkg/server/debug/server.go
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/v2/extensions/settings/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/settings/pkg/config"
)
// Server initializes the debug service and server.
services/settings/pkg/server/grpc/option.go
+2 -2
View File
@@ -3,9 +3,9 @@ package grpc
import (
"context"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/metrics"
"github.com/urfave/cli/v2"
)
services/settings/pkg/server/grpc/server.go
+1 -1
View File
@@ -4,10 +4,10 @@ import (
"context"
permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1"
svc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
svc "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0"
"go-micro.dev/v4/api"
"go-micro.dev/v4/server"
)
services/settings/pkg/server/http/option.go
+2 -2
View File
@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/metrics"
"github.com/urfave/cli/v2"
)
services/settings/pkg/server/http/server.go
+2 -2
View File
@@ -3,14 +3,14 @@ package http
import (
"github.com/go-chi/chi/v5"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/assets"
svc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/account"
"github.com/owncloud/ocis/v2/ocis-pkg/cors"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/service/http"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/assets"
svc "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0"
"go-micro.dev/v4"
)
services/settings/pkg/service/v0/instrument.go
+1 -1
View File
@@ -1,7 +1,7 @@
package svc
import (
"github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/v2/services/settings/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
services/settings/pkg/service/v0/option.go
+1 -1
View File
@@ -3,8 +3,8 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
)
// Option defines a single option function.
services/settings/pkg/service/v0/service.go
+4 -4
View File
@@ -8,15 +8,15 @@ import (
permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1"
rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
"github.com/cs3org/reva/v2/pkg/rgrpc/status"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
filestore "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/filesystem"
metastore "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/metadata"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/settings"
filestore "github.com/owncloud/ocis/v2/services/settings/pkg/store/filesystem"
metastore "github.com/owncloud/ocis/v2/services/settings/pkg/store/metadata"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
"google.golang.org/protobuf/types/known/emptypb"
services/settings/pkg/settings/settings.go
+1 -1
View File
@@ -3,8 +3,8 @@ package settings
import (
"errors"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
)
var (
services/settings/pkg/store/defaults/defaults.go
+1 -1
View File
@@ -1,8 +1,8 @@
package defaults
import (
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
)
const (
services/settings/pkg/store/filesystem/bundles.go
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"sync"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/errortypes"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/store/errortypes"
)
var m = &sync.RWMutex{}
services/settings/pkg/store/filesystem/io.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"io/ioutil"
"os"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/errortypes"
"github.com/owncloud/ocis/v2/services/settings/pkg/store/errortypes"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
)
services/settings/pkg/store/filesystem/permissions.go
+2 -2
View File
@@ -1,9 +1,9 @@
package store
import (
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/util"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/settings"
"github.com/owncloud/ocis/v2/services/settings/pkg/util"
)
// ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource
services/settings/pkg/store/filesystem/store.go
+2 -2
View File
@@ -4,9 +4,9 @@ package store
import (
"os"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/settings"
)
var (
services/settings/pkg/store/metadata/assignments_test.go
+1 -1
View File
@@ -6,10 +6,10 @@ import (
"testing"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults"
"github.com/stretchr/testify/require"
)
services/settings/pkg/store/metadata/bundles.go
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"fmt"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/defaults"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults"
)
// ListBundles returns all bundles in the dataPath folder that match the given type.
services/settings/pkg/store/metadata/permissions.go
+2 -2
View File
@@ -1,9 +1,9 @@
package store
import (
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/util"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/settings"
"github.com/owncloud/ocis/v2/services/settings/pkg/util"
)
// ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource
services/settings/pkg/store/metadata/store.go
+3 -3
View File
@@ -9,11 +9,11 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/metadata"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/store/defaults"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"github.com/owncloud/ocis/v2/services/settings/pkg/settings"
"github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults"
)
var (
services/settings/pkg/store/metadata/store_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"strings"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults"
"github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults"
)
const (
services/settings/pkg/store/registry.go
+2 -2
View File
@@ -2,6 +2,6 @@ package store
import (
// init filesystem store
_ "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/filesystem"
_ "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/metadata"
_ "github.com/owncloud/ocis/v2/services/settings/pkg/store/filesystem"
_ "github.com/owncloud/ocis/v2/services/settings/pkg/store/metadata"
)
services/settings/pkg/tracing/tracing.go
+1 -1
View File
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/v2/extensions/settings/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
"go.opentelemetry.io/otel/trace"
)