refactor settings

This commit is contained in:
Christian Richter
2022-04-13 17:04:37 +02:00
parent 92d76e00ab
commit 1a1a4d6a3c
114 changed files with 80 additions and 8747 deletions
@@ -29,7 +29,7 @@ import (
"github.com/owncloud/ocis/ocis-pkg/roles"
"github.com/owncloud/ocis/ocis-pkg/sync"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
settings_svc "github.com/owncloud/ocis/settings/pkg/service/v0"
settings_svc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/rs/zerolog"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
@@ -14,12 +14,12 @@ import (
"github.com/golang/protobuf/ptypes/empty"
config "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
ssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
olog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/roles"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
ssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/client"
merrors "go-micro.dev/v4/errors"
@@ -5,10 +5,10 @@ import (
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
ssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
olog "github.com/owncloud/ocis/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
ssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
)
const (
+1 -1
View File
@@ -24,10 +24,10 @@ import (
"github.com/go-chi/render"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
settingsServiceExt "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
v0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
settingsServiceExt "github.com/owncloud/ocis/settings/pkg/service/v0"
merrors "go-micro.dev/v4/errors"
)
+1 -1
View File
@@ -18,8 +18,8 @@ import (
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/extensions/graph/pkg/identity"
"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
settingssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
settings "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
settingssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
)
// GetMe implements the Service interface.
@@ -10,8 +10,8 @@ import (
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data"
"github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response"
settingsService "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/roles"
settingsService "github.com/owncloud/ocis/settings/pkg/service/v0"
)
// RequireSelfOrAdmin middleware is used to require the requesting user to be an admin or the requested user himself
+1 -1
View File
@@ -25,13 +25,13 @@ import (
accountsServiceExt "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/extensions/ocs/pkg/config"
svc "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0"
ssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
ocisLog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
ssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/client"
)
+1 -1
View File
@@ -8,9 +8,9 @@ import (
cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
settingsService "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/log"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
settingsService "github.com/owncloud/ocis/settings/pkg/service/v0"
)
type cs3backend struct {
@@ -1,7 +1,7 @@
SHELL := bash
NAME := settings
include ../.make/recursion.mk
include ../../.make/recursion.mk
.PHONY: test-acceptance-webui
test-acceptance-webui:
@@ -10,28 +10,28 @@ test-acceptance-webui:
############ tooling ############
ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
include ../.bingo/Variables.mk
include ../../.bingo/Variables.mk
endif
############ go tooling ############
include ../.make/go.mk
include ../../.make/go.mk
############ release ############
include ../.make/release.mk
include ../../.make/release.mk
############ docs generate ############
include ../.make/docs.mk
include ../../.make/docs.mk
############ l10n ############
include ../.make/l10n.mk
include ../../.make/l10n.mk
.PHONY: docs-generate
docs-generate: config-docs-generate \
grpc-docs-generate
############ generate ############
include ../.make/generate.mk
include ../../.make/generate.mk
.PHONY: ci-go-generate
ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
@@ -50,7 +50,7 @@ node_modules:
@yarn install --immutable 2>&1 >/dev/null
############ protobuf ############
include ../.make/protobuf.mk
include ../../.make/protobuf.mk
.PHONY: protobuf
protobuf: buf-generate
@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/settings/pkg/command"
"github.com/owncloud/ocis/settings/pkg/config/defaults"
"github.com/owncloud/ocis/extensions/settings/pkg/command"
"github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
)
func main() {
@@ -3,10 +3,10 @@ package assets
import (
"net/http"
"github.com/owncloud/ocis/extensions/settings"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/settings"
"github.com/owncloud/ocis/settings/pkg/config"
)
// New returns a new http filesystem to serve assets.
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/settings/pkg/config/parser"
"github.com/owncloud/ocis/settings/pkg/logging"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/config/parser"
"github.com/owncloud/ocis/extensions/settings/pkg/logging"
"github.com/urfave/cli/v2"
)
@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)
@@ -5,15 +5,15 @@ import (
"fmt"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/config/parser"
"github.com/owncloud/ocis/extensions/settings/pkg/logging"
"github.com/owncloud/ocis/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/extensions/settings/pkg/server/debug"
"github.com/owncloud/ocis/extensions/settings/pkg/server/grpc"
"github.com/owncloud/ocis/extensions/settings/pkg/server/http"
"github.com/owncloud/ocis/extensions/settings/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/settings/pkg/config/parser"
"github.com/owncloud/ocis/settings/pkg/logging"
"github.com/owncloud/ocis/settings/pkg/metrics"
"github.com/owncloud/ocis/settings/pkg/server/debug"
"github.com/owncloud/ocis/settings/pkg/server/grpc"
"github.com/owncloud/ocis/settings/pkg/server/http"
"github.com/owncloud/ocis/settings/pkg/tracing"
"github.com/urfave/cli/v2"
)
@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/urfave/cli/v2"
)
@@ -4,8 +4,8 @@ import (
"path"
"strings"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/settings/pkg/config"
)
func FullDefaultConfig() *config.Config {
@@ -3,9 +3,9 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/settings/pkg/config/defaults"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
)
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/settings/pkg/config"
)
// LoggerFromConfig initializes a service-specific logger instance.
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/settings/pkg/config"
)
// Option defines a single option function.
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/settings/pkg/config"
)
// Server initializes the debug service and server.
@@ -3,9 +3,9 @@ package grpc
import (
"context"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/settings/pkg/metrics"
"github.com/urfave/cli/v2"
)
@@ -4,10 +4,10 @@ import (
"context"
permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1"
svc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/ocis-pkg/version"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
"go-micro.dev/v4/api"
"go-micro.dev/v4/server"
)
@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/settings/pkg/metrics"
"github.com/urfave/cli/v2"
)
@@ -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/extensions/settings/pkg/assets"
svc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/account"
"github.com/owncloud/ocis/ocis-pkg/cors"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/settings/pkg/assets"
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
"go-micro.dev/v4"
)
@@ -1,7 +1,7 @@
package svc
import (
"github.com/owncloud/ocis/settings/pkg/metrics"
"github.com/owncloud/ocis/extensions/settings/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
@@ -3,8 +3,8 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/settings/pkg/config"
)
// Option defines a single option function.
@@ -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/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
filestore "github.com/owncloud/ocis/extensions/settings/pkg/store/filesystem"
metastore "github.com/owncloud/ocis/extensions/settings/pkg/store/metadata"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/roles"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/settings/pkg/settings"
filestore "github.com/owncloud/ocis/settings/pkg/store/filesystem"
metastore "github.com/owncloud/ocis/settings/pkg/store/metadata"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
"google.golang.org/protobuf/types/known/emptypb"
@@ -3,8 +3,8 @@ package settings
import (
"errors"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/settings/pkg/config"
)
var (
@@ -8,8 +8,8 @@ import (
"sync"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/store/errortypes"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/settings/pkg/store/errortypes"
)
var m = &sync.RWMutex{}
@@ -4,7 +4,7 @@ import (
"io/ioutil"
"os"
"github.com/owncloud/ocis/settings/pkg/store/errortypes"
"github.com/owncloud/ocis/extensions/settings/pkg/store/errortypes"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
)
@@ -1,9 +1,9 @@
package store
import (
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/extensions/settings/pkg/util"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/settings/pkg/settings"
"github.com/owncloud/ocis/settings/pkg/util"
)
// ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource
@@ -4,9 +4,9 @@ package store
import (
"os"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
olog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/settings/pkg/settings"
)
var (
@@ -7,8 +7,8 @@ import (
"fmt"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/store/defaults"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/settings/pkg/store/defaults"
)
// ListRoleAssignments loads and returns all role assignments matching the given assignment identifier.
@@ -5,9 +5,9 @@ import (
"sync"
"testing"
"github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
olog "github.com/owncloud/ocis/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/settings/pkg/config/defaults"
"github.com/stretchr/testify/require"
)
@@ -8,8 +8,8 @@ import (
"fmt"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/store/defaults"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/settings/pkg/store/defaults"
)
// ListBundles returns all bundles in the dataPath folder that match the given type.
@@ -1,9 +1,9 @@
package store
import (
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/extensions/settings/pkg/util"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/settings/pkg/settings"
"github.com/owncloud/ocis/settings/pkg/util"
)
// ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource
@@ -9,11 +9,11 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/metadata"
"github.com/gofrs/uuid"
"github.com/owncloud/ocis/extensions/settings/pkg/config"
"github.com/owncloud/ocis/extensions/settings/pkg/settings"
"github.com/owncloud/ocis/extensions/settings/pkg/store/defaults"
olog "github.com/owncloud/ocis/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/settings/pkg/config"
"github.com/owncloud/ocis/settings/pkg/settings"
"github.com/owncloud/ocis/settings/pkg/store/defaults"
)
var (
@@ -4,7 +4,7 @@ import (
"context"
"strings"
"github.com/owncloud/ocis/settings/pkg/config/defaults"
"github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
)
const (
@@ -0,0 +1,7 @@
package store
import (
// init filesystem store
_ "github.com/owncloud/ocis/extensions/settings/pkg/store/filesystem"
_ "github.com/owncloud/ocis/extensions/settings/pkg/store/metadata"
)
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/settings/pkg/config"
pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/settings/pkg/config"
"go.opentelemetry.io/otel/trace"
)

Some files were not shown because too many files have changed in this diff Show More