change module name

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2025-01-13 09:58:18 +01:00
parent 6cae0ba8f1
commit 8e028f17e9
995 changed files with 3044 additions and 3044 deletions
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"os/signal"
"syscall"
"github.com/owncloud/ocis/v2/services/proxy/pkg/command"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/command"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults"
)
func main() {
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
"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/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/parser"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/logging"
"github.com/urfave/cli/v2"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package command
import (
"os"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/clihelper"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/urfave/cli/v2"
)
+22 -22
View File
@@ -15,28 +15,28 @@ import (
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/justinas/alice"
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
pkgmiddleware "github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
policiessvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/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/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/router"
"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/staticroutes"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/userroles"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
pkgmiddleware "github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"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"
policiessvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/parser"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/logging"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/metrics"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/middleware"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/router"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/server/debug"
proxyHTTP "github.com/opencloud-eu/opencloud/services/proxy/pkg/server/http"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/staticroutes"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles"
"github.com/urfave/cli/v2"
"go-micro.dev/v4/selector"
microstore "go-micro.dev/v4/store"
+3 -3
View File
@@ -4,11 +4,11 @@ import (
"fmt"
"os"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/urfave/cli/v2"
)
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"go-micro.dev/v4/client"
)
@@ -7,10 +7,10 @@ import (
"strings"
"time"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/structs"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"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/services/proxy/pkg/config"
)
// FullDefaultConfig returns a fully initialized default configuration
+5 -5
View File
@@ -4,12 +4,12 @@ import (
"errors"
"fmt"
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"
ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.
+1 -1
View File
@@ -1,6 +1,6 @@
package config
import "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
// Tracing defines the available tracing configuration.
type Tracing struct {
+2 -2
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
)
// Configure initializes a service-specific logger instance.
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"time"
"github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"go.opentelemetry.io/otel/trace"
)
@@ -7,14 +7,14 @@ import (
"time"
"github.com/jellydator/ttlcache/v3"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/userroles"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
)
// AccountResolver provides a middleware which mints a jwt and adds it to the proxied request based
@@ -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/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/user/backend/mocks"
userRoleMocks "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles/mocks"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend/mocks"
userRoleMocks "github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
+1 -1
View File
@@ -7,7 +7,7 @@ import (
cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
)
// AppAuthAuthenticator defines the app auth authenticator
@@ -11,7 +11,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
)
var _ = Describe("Authenticating requests", Label("AppAuthAuthenticator"), func() {
@@ -7,8 +7,8 @@ import (
"regexp"
"strings"
"github.com/owncloud/ocis/v2/services/proxy/pkg/router"
"github.com/owncloud/ocis/v2/services/proxy/pkg/webdav"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/router"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/webdav"
"go.opentelemetry.io/otel/trace"
"golang.org/x/text/cases"
"golang.org/x/text/language"
@@ -13,12 +13,12 @@ import (
"github.com/golang-jwt/jwt/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
oidcmocks "github.com/owncloud/ocis/v2/ocis-pkg/oidc/mocks"
"github.com/owncloud/ocis/v2/services/proxy/pkg/router"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend/mocks"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
oidcmocks "github.com/opencloud-eu/opencloud/ocis-pkg/oidc/mocks"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/router"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend/mocks"
"github.com/stretchr/testify/mock"
"go-micro.dev/v4/store"
"google.golang.org/grpc"
+3 -3
View File
@@ -3,9 +3,9 @@ package middleware
import (
"net/http"
"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/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
)
// BasicAuthenticator is the authenticator responsible for HTTP Basic authentication.
@@ -9,10 +9,10 @@ import (
"github.com/stretchr/testify/mock"
. "github.com/onsi/gomega"
"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/user/backend/mocks"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend/mocks"
)
var _ = Describe("Authenticating requests", Label("BasicAuthenticator"), func() {
@@ -3,7 +3,7 @@ package middleware
import (
"net/http"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
)
// ContextLogger is a middleware to use a logger associated with the request's
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"github.com/cs3org/reva/v2/pkg/rgrpc/status"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/graph/pkg/errorcode"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
"google.golang.org/grpc/metadata"
)
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"time"
"github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/v2/services/proxy/pkg/metrics"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/metrics"
"github.com/prometheus/client_golang/prometheus"
)
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"time"
"github.com/golang-jwt/jwt/v5"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/pkg/errors"
"github.com/shamaton/msgpack/v2"
store "go-micro.dev/v4/store"
@@ -8,9 +8,9 @@ import (
"github.com/golang-jwt/jwt/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
oidcmocks "github.com/owncloud/ocis/v2/ocis-pkg/oidc/mocks"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
oidcmocks "github.com/opencloud-eu/opencloud/ocis-pkg/oidc/mocks"
"github.com/stretchr/testify/mock"
"go-micro.dev/v4/store"
)
+7 -7
View File
@@ -7,13 +7,13 @@ import (
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
policiessvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"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/userroles"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
policiessvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles"
"go-micro.dev/v4/store"
"go.opentelemetry.io/otel/trace"
)
+3 -3
View File
@@ -17,9 +17,9 @@ import (
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/utils"
pMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0"
pService "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0"
"github.com/owncloud/ocis/v2/services/webdav/pkg/net"
pMessage "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0"
pService "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0"
"github.com/opencloud-eu/opencloud/services/webdav/pkg/net"
)
type (
@@ -14,11 +14,11 @@ import (
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
. "github.com/onsi/gomega"
pMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0"
policiesPG "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0"
"github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0/mocks"
"github.com/owncloud/ocis/v2/services/proxy/pkg/middleware"
"github.com/owncloud/ocis/v2/services/webdav/pkg/net"
pMessage "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0"
policiesPG "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0"
"github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0/mocks"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/middleware"
"github.com/opencloud-eu/opencloud/services/webdav/pkg/net"
"github.com/stretchr/testify/mock"
"go-micro.dev/v4/client"
"google.golang.org/grpc"
@@ -6,7 +6,7 @@ import (
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
)
const (
@@ -11,7 +11,7 @@ import (
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"google.golang.org/grpc"
)
+1 -1
View File
@@ -6,7 +6,7 @@ import (
gofig "github.com/gookit/config/v2"
"github.com/gookit/config/v2/yaml"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/unrolled/secure"
"github.com/unrolled/secure/cspbuilder"
)
@@ -3,10 +3,10 @@ package middleware
import (
"net/http"
"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"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy/policy"
)
// SelectorCookie provides a middleware which
@@ -11,10 +11,10 @@ import (
"time"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"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/user/backend"
"github.com/owncloud/ocis/v2/services/proxy/pkg/userroles"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles"
microstore "go-micro.dev/v4/store"
"golang.org/x/crypto/pbkdf2"
)
@@ -8,7 +8,7 @@ import (
userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/store"
)
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"net/http"
chimiddleware "github.com/go-chi/chi/v5/middleware"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
pkgtrace "github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/trace"
+2 -2
View File
@@ -1,8 +1,8 @@
package proxy
import (
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
)
// Option defines a single option function.
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"sort"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
)
var (
@@ -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/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
)
func TestLoadSelector(t *testing.T) {
+4 -4
View File
@@ -11,10 +11,10 @@ import (
"os"
"time"
"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/proxy/policy"
"github.com/owncloud/ocis/v2/services/proxy/pkg/router"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy/policy"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/router"
"github.com/rs/zerolog"
)
@@ -9,10 +9,10 @@ import (
"net/url"
"testing"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/router"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/router"
"go-micro.dev/v4/selector"
)
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"regexp"
"strings"
"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/proxy/policy"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy/policy"
"go-micro.dev/v4/selector"
)
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"net/url"
"testing"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults"
"go-micro.dev/v4/selector"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
)
// Option defines a single option function.
+5 -5
View File
@@ -6,11 +6,11 @@ import (
"github.com/ggwhite/go-masker"
"github.com/owncloud/ocis/v2/ocis-pkg/checks"
"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
"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"
"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/services/proxy/pkg/config"
)
// Server initializes the debug service and server.
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"net/http"
"github.com/justinas/alice"
"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/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/metrics"
"github.com/urfave/cli/v2"
)
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"fmt"
"os"
pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto"
"github.com/owncloud/ocis/v2/ocis-pkg/service/http"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
pkgcrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto"
"github.com/opencloud-eu/opencloud/ocis-pkg/service/http"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"go-micro.dev/v4"
)
@@ -8,7 +8,7 @@ import (
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/go-chi/render"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/pkg/errors"
"github.com/shamaton/msgpack/v2"
microstore "go-micro.dev/v4/store"
@@ -5,10 +5,10 @@ import (
"github.com/cs3org/reva/v2/pkg/events"
"github.com/go-chi/chi/v5"
"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/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend"
microstore "go-micro.dev/v4/store"
)
+4 -4
View File
@@ -15,10 +15,10 @@ import (
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
utils "github.com/cs3org/reva/v2/pkg/utils"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
"github.com/owncloud/ocis/v2/services/graph/pkg/errorcode"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"go-micro.dev/v4/selector"
)
+3 -3
View File
@@ -5,9 +5,9 @@ import (
cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
settingsService "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0"
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
settingsService "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0"
"go-micro.dev/v4/metadata"
)
+3 -3
View File
@@ -8,9 +8,9 @@ import (
cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/oidc"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"go-micro.dev/v4/metadata"
)
+3 -3
View File
@@ -6,9 +6,9 @@ import (
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
)
// UserRoleAssigner allows providing different implementations for how users get their default roles