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

Bump major version to v2

Browse Source
This commit is contained in:
Michael Barz
2022-05-04 14:49:59 +02:00
parent a3c4a9d57d
commit 189987bcbd
708 changed files with 2198 additions and 2183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/graph/cmd/graph/main.go
+2 -2
View File
@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/graph/pkg/command"
"github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/command"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults"
)
func main() {
extensions/graph/pkg/command/health.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/extensions/graph/pkg/config/parser"
"github.com/owncloud/ocis/extensions/graph/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/logging"
"github.com/urfave/cli/v2"
)
extensions/graph/pkg/command/root.go
+3 -3
View File
@@ -4,11 +4,11 @@ import (
"context"
"os"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
"github.com/thejerf/suture/v4"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/urfave/cli/v2"
)
extensions/graph/pkg/command/server.go
+8 -8
View File
@@ -5,14 +5,14 @@ import (
"fmt"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/extensions/graph/pkg/config/parser"
"github.com/owncloud/ocis/extensions/graph/pkg/logging"
"github.com/owncloud/ocis/extensions/graph/pkg/metrics"
"github.com/owncloud/ocis/extensions/graph/pkg/server/debug"
"github.com/owncloud/ocis/extensions/graph/pkg/server/http"
"github.com/owncloud/ocis/extensions/graph/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/server/http"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)
extensions/graph/pkg/command/version.go
+3 -3
View File
@@ -4,11 +4,11 @@ import (
"fmt"
"os"
"github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/urfave/cli/v2"
)
extensions/graph/pkg/config/config.go
+1 -1
View File
@@ -3,7 +3,7 @@ package config
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
)
// Config combines all available configuration parts.
extensions/graph/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -3,7 +3,7 @@ package defaults
import (
"strings"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
)
func FullDefaultConfig() *config.Config {
extensions/graph/pkg/config/parser/parse.go
+5 -5
View File
@@ -3,12 +3,12 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.
extensions/graph/pkg/identity/cs3.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
var (
extensions/graph/pkg/identity/ldap.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
ldapdn "github.com/libregraph/idm/pkg/ldapdn"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
var (
extensions/graph/pkg/identity/ldap/reconnect.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/go-ldap/ldap/v3"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
var (
extensions/graph/pkg/identity/ldap_test.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"time"
"github.com/go-ldap/ldap/v3"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// ldapMock implements the ldap.Client interfac
extensions/graph/pkg/logging/logging.go
+2 -2
View File
@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.
extensions/graph/pkg/middleware/auth.go
+2 -2
View File
@@ -6,8 +6,8 @@ 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/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/ocis-pkg/account"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/v2/ocis-pkg/account"
"google.golang.org/grpc/metadata"
)
extensions/graph/pkg/middleware/requireadmin.go
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"net/http"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/roles"
accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
)
// RequireAdmin middleware is used to require the user in context to be an admin / have account management permissions
extensions/graph/pkg/server/debug/option.go
+2 -2
View File
@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.
extensions/graph/pkg/server/debug/server.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
)
// Server initializes the debug service and server.
extensions/graph/pkg/server/http/option.go
+3 -3
View File
@@ -3,9 +3,9 @@ package http
import (
"context"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/extensions/graph/pkg/metrics"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/metrics"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)
extensions/graph/pkg/server/http/server.go
+6 -6
View File
@@ -4,12 +4,12 @@ import (
"github.com/cs3org/reva/v2/pkg/events/server"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/go-micro/plugins/v4/events/natsjs"
graphMiddleware "github.com/owncloud/ocis/extensions/graph/pkg/middleware"
svc "github.com/owncloud/ocis/extensions/graph/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/account"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
"github.com/owncloud/ocis/ocis-pkg/version"
graphMiddleware "github.com/owncloud/ocis/v2/extensions/graph/pkg/middleware"
svc "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/account"
"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"
"github.com/pkg/errors"
"go-micro.dev/v4"
)
extensions/graph/pkg/service/v0/driveitems.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/go-chi/render"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
)
// GetRootDriveChildren implements the Service interface.
extensions/graph/pkg/service/v0/drives.go
+5 -5
View File
@@ -23,11 +23,11 @@ import (
"github.com/go-chi/chi/v5"
"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"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
settingsServiceExt "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
merrors "go-micro.dev/v4/errors"
)
extensions/graph/pkg/service/v0/graph.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/go-chi/chi/v5"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/extensions/graph/pkg/identity"
"github.com/owncloud/ocis/ocis-pkg/log"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/identity"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
mevents "go-micro.dev/v4/events"
"google.golang.org/grpc"
)
extensions/graph/pkg/service/v0/graph_test.go
+5 -5
View File
@@ -16,11 +16,11 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/extensions/graph/mocks"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
service "github.com/owncloud/ocis/extensions/graph/pkg/service/v0"
"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/v2/extensions/graph/mocks"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults"
service "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
"github.com/stretchr/testify/mock"
)
extensions/graph/pkg/service/v0/groups.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/CiscoM31/godata"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/go-chi/chi/v5"
extensions/graph/pkg/service/v0/instrument.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/extensions/graph/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/metrics"
)
// NewInstrument returns a service that instruments metrics.
extensions/graph/pkg/service/v0/logging.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// NewLogging returns a service that logs messages.
extensions/graph/pkg/service/v0/option.go
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"net/http"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/owncloud/ocis/extensions/graph/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/roles"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
// Option defines a single option function.
extensions/graph/pkg/service/v0/service.go
+8 -8
View File
@@ -11,14 +11,14 @@ import (
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/extensions/graph/pkg/identity"
"github.com/owncloud/ocis/extensions/graph/pkg/identity/ldap"
graphm "github.com/owncloud/ocis/extensions/graph/pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/account"
opkgm "github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/roles"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/identity"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/identity/ldap"
graphm "github.com/owncloud/ocis/v2/extensions/graph/pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/account"
opkgm "github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
const (
extensions/graph/pkg/service/v0/users.go
+4 -4
View File
@@ -16,10 +16,10 @@ import (
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
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"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/identity"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode"
settingssvc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
// GetMe implements the Service interface.
extensions/graph/pkg/tracing/tracing.go
+2 -2
View File
@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/graph/pkg/config"
pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)