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

use plain pkg module

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2025-01-13 16:42:19 +01:00
committed by Florian Schade
parent 259cbc2e56
commit b07b5a1149
841 changed files with 1383 additions and 1366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/graph/pkg/command/health.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"net/http"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/opencloud-eu/opencloud/pkg/config/configlog"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/parser"
"github.com/opencloud-eu/opencloud/services/graph/pkg/logging"
services/graph/pkg/command/root.go
+1 -1
View File
@@ -3,7 +3,7 @@ package command
import (
"os"
"github.com/opencloud-eu/opencloud/ocis-pkg/clihelper"
"github.com/opencloud-eu/opencloud/pkg/clihelper"
"github.com/urfave/cli/v2"
services/graph/pkg/command/server.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"fmt"
"github.com/oklog/run"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/pkg/config/configlog"
"github.com/opencloud-eu/opencloud/pkg/tracing"
"github.com/opencloud-eu/opencloud/pkg/version"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/parser"
"github.com/opencloud-eu/opencloud/services/graph/pkg/logging"
services/graph/pkg/command/unified_roles.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/olekukonko/tablewriter"
"github.com/urfave/cli/v2"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/opencloud-eu/opencloud/pkg/config/configlog"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/parser"
"github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
services/graph/pkg/command/version.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"os"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/pkg/registry"
"github.com/opencloud-eu/opencloud/pkg/version"
tw "github.com/olekukonko/tablewriter"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
services/graph/pkg/config/config.go
+1 -1
View File
@@ -3,7 +3,7 @@ package config
import (
"context"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
)
// Config combines all available configuration parts.
services/graph/pkg/config/defaults/defaultconfig.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"strings"
"time"
"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/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/structs"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
)
services/graph/pkg/config/http.go
+1 -1
View File
@@ -1,6 +1,6 @@
package config
import "github.com/opencloud-eu/opencloud/ocis-pkg/shared"
import "github.com/opencloud-eu/opencloud/pkg/shared"
// HTTP defines the available http configuration.
type HTTP struct {
services/graph/pkg/config/parser/parse.go
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"github.com/go-ldap/ldap/v3"
ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
defaults2 "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
services/graph/pkg/config/tracing.go
+1 -1
View File
@@ -1,6 +1,6 @@
package config
import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
import "github.com/opencloud-eu/opencloud/pkg/tracing"
// Tracing defines the available tracing configuration.
type Tracing struct {
services/graph/pkg/identity/cs3.go
+3 -3
View File
@@ -11,10 +11,10 @@ import (
cs3user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
libregraph "github.com/owncloud/libre-graph-api-go"
)
var (
services/graph/pkg/identity/ldap.go
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"github.com/libregraph/idm/pkg/ldapdn"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
)
services/graph/pkg/identity/ldap/reconnect.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/go-ldap/ldap/v3"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
)
var (
services/graph/pkg/identity/ldap_education_school.go
+2 -2
View File
@@ -8,10 +8,10 @@ import (
"github.com/go-ldap/ldap/v3"
"github.com/gofrs/uuid"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
libregraph "github.com/owncloud/libre-graph-api-go"
)
type educationConfig struct {
services/graph/pkg/identity/ldap_test.go
+2 -2
View File
@@ -9,10 +9,10 @@ import (
"github.com/CiscoM31/godata"
"github.com/go-ldap/ldap/v3"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
services/graph/pkg/l10n/translation.go
+1 -1
View File
@@ -3,7 +3,7 @@ package l10n
import (
"embed"
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
"github.com/opencloud-eu/opencloud/pkg/l10n"
)
var (
services/graph/pkg/logging/logging.go
+1 -1
View File
@@ -1,7 +1,7 @@
package logging
import (
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
)
services/graph/pkg/middleware/auth.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
ctxpkg "github.com/cs3org/reva/v2/pkg/ctx"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
"github.com/opencloud-eu/opencloud/ocis-pkg/account"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
opkgm "github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"github.com/opencloud-eu/opencloud/pkg/account"
"github.com/opencloud-eu/opencloud/pkg/log"
opkgm "github.com/opencloud-eu/opencloud/pkg/middleware"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
)
services/graph/pkg/middleware/requireadmin.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"net/http"
revactx "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/roles"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/roles"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
settings "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0"
)
services/graph/pkg/server/debug/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package debug
import (
"context"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
)
services/graph/pkg/server/debug/server.go
+4 -4
View File
@@ -3,10 +3,10 @@ package debug
import (
"net/http"
"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/pkg/checks"
"github.com/opencloud-eu/opencloud/pkg/handlers"
"github.com/opencloud-eu/opencloud/pkg/service/debug"
"github.com/opencloud-eu/opencloud/pkg/version"
)
// Server initializes the debug service and server.
services/graph/pkg/server/http/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package http
import (
"context"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/metrics"
"github.com/urfave/cli/v2"
services/graph/pkg/server/http/server.go
+8 -8
View File
@@ -12,14 +12,14 @@ import (
"go-micro.dev/v4"
"go-micro.dev/v4/events"
"github.com/opencloud-eu/opencloud/ocis-pkg/account"
"github.com/opencloud-eu/opencloud/ocis-pkg/cors"
"github.com/opencloud-eu/opencloud/ocis-pkg/keycloak"
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
"github.com/opencloud-eu/opencloud/ocis-pkg/service/http"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/pkg/account"
"github.com/opencloud-eu/opencloud/pkg/cors"
"github.com/opencloud-eu/opencloud/pkg/keycloak"
"github.com/opencloud-eu/opencloud/pkg/middleware"
"github.com/opencloud-eu/opencloud/pkg/registry"
"github.com/opencloud-eu/opencloud/pkg/service/grpc"
"github.com/opencloud-eu/opencloud/pkg/service/http"
"github.com/opencloud-eu/opencloud/pkg/version"
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
services/graph/pkg/service/v0/api_driveitem_permissions.go
+3 -3
View File
@@ -27,11 +27,11 @@ import (
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
"github.com/opencloud-eu/opencloud/pkg/l10n"
l10n_pkg "github.com/opencloud-eu/opencloud/services/graph/pkg/l10n"
"github.com/opencloud-eu/opencloud/ocis-pkg/conversions"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/conversions"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go
+2 -2
View File
@@ -15,14 +15,14 @@ import (
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
"github.com/opencloud-eu/opencloud/services/graph/pkg/linktype"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
)
services/graph/pkg/service/v0/api_driveitem_permissions_test.go
+2 -2
View File
@@ -20,8 +20,8 @@ import (
"github.com/go-chi/chi/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
"github.com/tidwall/gjson"
"google.golang.org/grpc"
@@ -33,7 +33,7 @@ import (
"github.com/cs3org/reva/v2/pkg/utils"
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
services/graph/pkg/service/v0/api_drives_drive_item.go
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
)
services/graph/pkg/service/v0/api_drives_drive_item_test.go
+2 -2
View File
@@ -23,8 +23,8 @@ import (
"github.com/cs3org/reva/v2/pkg/rgrpc/status"
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
"github.com/opencloud-eu/opencloud/ocis-pkg/conversions"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/conversions"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
svc "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
services/graph/pkg/service/v0/application_test.go
+2 -2
View File
@@ -13,8 +13,7 @@ import (
"github.com/go-chi/chi/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
@@ -22,6 +21,7 @@ import (
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
)
services/graph/pkg/service/v0/approleassignments_test.go
+2 -2
View File
@@ -17,8 +17,7 @@ import (
"github.com/golang/protobuf/ptypes/empty"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
@@ -26,6 +25,7 @@ import (
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
)
services/graph/pkg/service/v0/base.go
+1 -1
View File
@@ -25,7 +25,7 @@ import (
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
services/graph/pkg/service/v0/driveitems.go
+1 -1
View File
@@ -28,7 +28,7 @@ import (
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
)
services/graph/pkg/service/v0/driveitems_test.go
+1 -1
View File
@@ -25,7 +25,7 @@ import (
"github.com/cs3org/reva/v2/pkg/utils"
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
services/graph/pkg/service/v0/drives.go
+1 -1
View File
@@ -28,7 +28,7 @@ import (
"golang.org/x/sync/errgroup"
"google.golang.org/protobuf/proto"
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
"github.com/opencloud-eu/opencloud/pkg/l10n"
v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
services/graph/pkg/service/v0/educationclasses_test.go
+2 -2
View File
@@ -17,14 +17,14 @@ import (
"github.com/go-chi/chi/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
)
services/graph/pkg/service/v0/educationschools_test.go
+2 -2
View File
@@ -21,13 +21,13 @@ import (
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
)
type schoolList struct {
services/graph/pkg/service/v0/educationuser_test.go
+2 -2
View File
@@ -19,14 +19,14 @@ import (
"github.com/go-chi/chi/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
)
services/graph/pkg/service/v0/graph.go
+1 -1
View File
@@ -19,7 +19,7 @@ import (
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/opencloud-eu/opencloud/ocis-pkg/keycloak"
"github.com/opencloud-eu/opencloud/pkg/keycloak"
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
services/graph/pkg/service/v0/graph_suite_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc_test
import (
"testing"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/pkg/registry"
mRegistry "go-micro.dev/v4/registry"
. "github.com/onsi/ginkgo/v2"
services/graph/pkg/service/v0/graph_test.go
+1 -1
View File
@@ -29,7 +29,7 @@ import (
"github.com/tidwall/gjson"
"google.golang.org/grpc"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
services/graph/pkg/service/v0/groups_test.go
+2 -2
View File
@@ -17,8 +17,7 @@ import (
"github.com/go-chi/chi/v5"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
@@ -27,6 +26,7 @@ import (
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
)
services/graph/pkg/service/v0/option.go
+3 -3
View File
@@ -7,9 +7,9 @@ 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/opencloud-eu/opencloud/ocis-pkg/keycloak"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/roles"
"github.com/opencloud-eu/opencloud/pkg/keycloak"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/roles"
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
services/graph/pkg/service/v0/password_test.go
+3 -3
View File
@@ -17,15 +17,15 @@ import (
"github.com/go-ldap/ldap/v3"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
)
services/graph/pkg/service/v0/service.go
+5 -5
View File
@@ -22,11 +22,11 @@ import (
"github.com/cs3org/reva/v2/pkg/store"
"github.com/cs3org/reva/v2/pkg/utils"
ocisldap "github.com/opencloud-eu/opencloud/ocis-pkg/ldap"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/ocis-pkg/roles"
"github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
ocisldap "github.com/opencloud-eu/opencloud/pkg/ldap"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/registry"
"github.com/opencloud-eu/opencloud/pkg/roles"
"github.com/opencloud-eu/opencloud/pkg/service/grpc"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity/ldap"
services/graph/pkg/service/v0/sharedbyme_test.go
+2 -2
View File
@@ -23,8 +23,7 @@ import (
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/graph/mocks"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
@@ -32,6 +31,7 @@ import (
"github.com/opencloud-eu/opencloud/services/graph/pkg/linktype"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
"github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
)
services/graph/pkg/service/v0/sharedwithme_test.go
+2 -2
View File
@@ -26,13 +26,13 @@ import (
"google.golang.org/grpc"
"google.golang.org/protobuf/proto"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
libregraph "github.com/owncloud/libre-graph-api-go"
// "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
)
services/graph/pkg/service/v0/spacetemplates.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"github.com/cs3org/reva/v2/pkg/storage/utils/metadata"
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
"github.com/opencloud-eu/opencloud/pkg/l10n"
l10n_pkg "github.com/opencloud-eu/opencloud/services/graph/pkg/l10n"
)
services/graph/pkg/service/v0/users_test.go
+1 -1
View File
@@ -26,7 +26,7 @@ import (
"go-micro.dev/v4/client"
"google.golang.org/grpc"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
settingsmocks "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0/mocks"
services/graph/pkg/service/v0/utils.go
+1 -1
View File
@@ -18,7 +18,7 @@ import (
libregraph "github.com/owncloud/libre-graph-api-go"
"golang.org/x/sync/errgroup"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
"github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
services/graph/pkg/service/v0/utils_test.go
+2 -2
View File
@@ -17,8 +17,8 @@ import (
"github.com/cs3org/reva/v2/pkg/storagespace"
"google.golang.org/protobuf/testing/protocmp"
"github.com/opencloud-eu/opencloud/ocis-pkg/conversions"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/conversions"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0"
"github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
services/graph/pkg/unifiedrole/conversion_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/onsi/gomega/types"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/conversions"
"github.com/opencloud-eu/opencloud/pkg/conversions"
"github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
)
services/graph/pkg/unifiedrole/roles.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/cs3org/reva/v2/pkg/conversions"
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
"github.com/opencloud-eu/opencloud/pkg/l10n"
)
const (
services/graph/pkg/validate/libregraph_test.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
. "github.com/onsi/gomega"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/ocis-pkg/conversions"
"github.com/opencloud-eu/opencloud/pkg/conversions"
"github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole"
"github.com/opencloud-eu/opencloud/services/graph/pkg/validate"
)