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/proxy/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/logging"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/proxy/pkg/logging"
"github.com/urfave/cli/v2"
)
services/proxy/pkg/command/root.go
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/v2/extensions/proxy/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/proxy/pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)
services/proxy/pkg/command/server.go
+11 -11
View File
@@ -13,23 +13,23 @@ import (
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/justinas/alice"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/cs3"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/middleware"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/proxy"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/server/debug"
proxyHTTP "github.com/owncloud/ocis/v2/extensions/proxy/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
pkgmiddleware "github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"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"
storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/proxy/pkg/cs3"
"github.com/owncloud/ocis/v2/services/proxy/pkg/logging"
"github.com/owncloud/ocis/v2/services/proxy/pkg/metrics"
"github.com/owncloud/ocis/v2/services/proxy/pkg/middleware"
"github.com/owncloud/ocis/v2/services/proxy/pkg/proxy"
"github.com/owncloud/ocis/v2/services/proxy/pkg/server/debug"
proxyHTTP "github.com/owncloud/ocis/v2/services/proxy/pkg/server/http"
"github.com/owncloud/ocis/v2/services/proxy/pkg/tracing"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
"github.com/urfave/cli/v2"
"golang.org/x/oauth2"
)
services/proxy/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/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/urfave/cli/v2"
)
services/proxy/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"path"
"strings"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
)
func FullDefaultConfig() *config.Config {
services/proxy/pkg/config/parser/parse.go
+2 -2
View File
@@ -3,10 +3,10 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/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/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
services/proxy/pkg/cs3/client.go
+1 -1
View File
@@ -2,7 +2,7 @@ package cs3
import (
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
proxytracing "github.com/owncloud/ocis/v2/extensions/proxy/pkg/tracing"
proxytracing "github.com/owncloud/ocis/v2/services/proxy/pkg/tracing"
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
services/proxy/pkg/logging/logging.go
+1 -1
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
)
// LoggerFromConfig initializes a service-specific logger instance.
services/proxy/pkg/middleware/account_resolver.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"errors"
"net/http"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
services/proxy/pkg/middleware/account_resolver_test.go
+3 -3
View File
@@ -10,11 +10,11 @@ import (
"github.com/cs3org/reva/v2/pkg/auth/scope"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend/test"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend/test"
"github.com/stretchr/testify/assert"
)
services/proxy/pkg/middleware/basic_auth.go
+2 -2
View File
@@ -5,10 +5,10 @@ import (
"net/http"
"strings"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/webdav"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/webdav"
)
// BasicAuth provides a middleware to check if BasicAuth is provided
services/proxy/pkg/middleware/oidc_auth.go
+1 -1
View File
@@ -9,10 +9,10 @@ import (
"github.com/golang-jwt/jwt/v4"
gOidc "github.com/coreos/go-oidc/v3/oidc"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"golang.org/x/oauth2"
)
services/proxy/pkg/middleware/options.go
+2 -2
View File
@@ -4,14 +4,14 @@ import (
"net/http"
"time"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0"
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
)
// Option defines a single option function.
services/proxy/pkg/middleware/selector_cookie.go
+2 -2
View File
@@ -3,10 +3,10 @@ package middleware
import (
"net/http"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/proxy/policy"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/proxy/policy"
)
// SelectorCookie provides a middleware which
services/proxy/pkg/middleware/signed_url_auth.go
+2 -2
View File
@@ -12,11 +12,11 @@ import (
"time"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
storemsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0"
storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
"golang.org/x/crypto/pbkdf2"
)
services/proxy/pkg/proxy/option.go
+1 -1
View File
@@ -1,8 +1,8 @@
package proxy
import (
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
)
// Option defines a single option function.
services/proxy/pkg/proxy/policy/selector.go
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"sort"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
)
var (
services/proxy/pkg/proxy/policy/selector_test.go
+1 -1
View File
@@ -8,8 +8,8 @@ import (
userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
)
func TestLoadSelector(t *testing.T) {
services/proxy/pkg/proxy/proxy.go
+3 -3
View File
@@ -16,12 +16,12 @@ import (
"go.opentelemetry.io/otel/attribute"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/proxy/policy"
proxytracing "github.com/owncloud/ocis/v2/extensions/proxy/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/proxy/policy"
proxytracing "github.com/owncloud/ocis/v2/services/proxy/pkg/tracing"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/trace"
)
services/proxy/pkg/proxy/proxy_integration_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"net/url"
"testing"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
)
func TestProxyIntegration(t *testing.T) {
services/proxy/pkg/proxy/proxy_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"net/url"
"testing"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/defaults"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults"
)
type matchertest struct {
services/proxy/pkg/server/debug/option.go
+1 -1
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
)
// Option defines a single option function.
services/proxy/pkg/server/debug/server.go
+1 -1
View File
@@ -5,9 +5,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/v2/extensions/proxy/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/proxy/pkg/config"
)
// Server initializes the debug service and server.
services/proxy/pkg/server/http/option.go
+2 -2
View File
@@ -5,9 +5,9 @@ import (
"net/http"
"github.com/justinas/alice"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/metrics"
"github.com/urfave/cli/v2"
)
services/proxy/pkg/tracing/tracing.go
+1 -1
View File
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"go.opentelemetry.io/otel/trace"
)
services/proxy/pkg/user/backend/cs3.go
+2 -2
View File
@@ -16,12 +16,12 @@ import (
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/token"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
settingsService "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/services/graph/pkg/service/v0/errorcode"
settingsService "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/selector"
)
services/proxy/pkg/user/backend/test/backend_mock.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"sync"
userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
)
// Ensure, that UserBackendMock does implement UserBackend.