Bump major version to v2

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

View File

@@ -25,7 +25,7 @@ func main() {
log.Fatal(err)
}
replacer := strings.NewReplacer(
"../../", "github.com/owncloud/ocis/",
"../../", "github.com/owncloud/ocis/v2/",
"/defaultconfig.go", "",
)
for i := range paths {

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/accounts/pkg/command"
"github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/command"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/defaults"
)
func main() {

View File

@@ -3,10 +3,10 @@ package assets
import (
"net/http"
"github.com/owncloud/ocis/extensions/accounts"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/accounts"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/assetsfs"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// New returns a new http filesystem to serve assets.

View File

@@ -3,12 +3,12 @@ package command
import (
"fmt"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/go-micro/plugins/v4/client/grpc"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset"
"github.com/urfave/cli/v2"
)

View File

@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/extensions/accounts/pkg/config/parser"
"github.com/owncloud/ocis/extensions/accounts/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/logging"
"github.com/urfave/cli/v2"
)

View File

@@ -5,14 +5,14 @@ import (
"os"
"strconv"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset"
"github.com/go-micro/plugins/v4/client/grpc"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/urfave/cli/v2"
)

View File

@@ -5,14 +5,14 @@ import (
"os"
"strconv"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset"
"github.com/go-micro/plugins/v4/client/grpc"
tw "github.com/olekukonko/tablewriter"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/urfave/cli/v2"
)

View File

@@ -4,10 +4,10 @@ import (
"context"
"fmt"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/go-micro/plugins/v4/client/grpc"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/urfave/cli/v2"
merrors "go-micro.dev/v4/errors"
)

View File

@@ -4,12 +4,12 @@ import (
"fmt"
"os"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset"
"github.com/go-micro/plugins/v4/client/grpc"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/urfave/cli/v2"
)

View File

@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)

View File

@@ -5,16 +5,16 @@ import (
"fmt"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/extensions/accounts/pkg/config/parser"
"github.com/owncloud/ocis/extensions/accounts/pkg/logging"
"github.com/owncloud/ocis/extensions/accounts/pkg/metrics"
"github.com/owncloud/ocis/extensions/accounts/pkg/server/debug"
"github.com/owncloud/ocis/extensions/accounts/pkg/server/grpc"
"github.com/owncloud/ocis/extensions/accounts/pkg/server/http"
svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/extensions/accounts/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/metrics"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/server/grpc"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/server/http"
svc "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)

View File

@@ -4,13 +4,13 @@ import (
"errors"
"fmt"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/owncloud/ocis/extensions/accounts/pkg/flagset"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset"
"github.com/go-micro/plugins/v4/client/grpc"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/urfave/cli/v2"
"google.golang.org/genproto/protobuf/field_mask"
)

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/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/urfave/cli/v2"
)

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.

View File

@@ -4,8 +4,8 @@ import (
"path"
"strings"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
)
func FullDefaultConfig() *config.Config {

View File

@@ -3,12 +3,12 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
defaults "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
defaults "github.com/owncloud/ocis/v2/extensions/accounts/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.

View File

@@ -1,10 +1,10 @@
package flagset
import (
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/flags"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/flags"
"github.com/urfave/cli/v2"
)

View File

@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.

View File

@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.

View File

@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/accounts/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.

View File

@@ -3,10 +3,10 @@ package grpc
import (
"context"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/extensions/accounts/pkg/metrics"
svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/metrics"
svc "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)

View File

@@ -1,10 +1,10 @@
package grpc
import (
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
)
// Server initializes a new go-micro service ready to run

View File

@@ -3,10 +3,10 @@ package http
import (
"context"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/extensions/accounts/pkg/metrics"
svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/metrics"
svc "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/urfave/cli/v2"
)

View File

@@ -1,16 +1,16 @@
package http
import (
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/go-chi/chi/v5"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/extensions/accounts/pkg/assets"
"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"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/assets"
"github.com/owncloud/ocis/v2/ocis-pkg/account"
"github.com/owncloud/ocis/v2/ocis-pkg/cors"
"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"
"go-micro.dev/v4"
)

View File

@@ -16,20 +16,20 @@ import (
"go.opentelemetry.io/otel/attribute"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/gofrs/uuid"
"github.com/golang/protobuf/ptypes/empty"
fieldmask_utils "github.com/mennanov/fieldmask-utils"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
accTracing "github.com/owncloud/ocis/extensions/accounts/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"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/extensions/settings/pkg/service/v0"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage"
accTracing "github.com/owncloud/ocis/v2/extensions/accounts/pkg/tracing"
settings_svc "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/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"github.com/rs/zerolog"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"

View File

@@ -9,17 +9,17 @@ import (
"testing"
"time"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"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"
config "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/defaults"
ssvc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/client"
merrors "go-micro.dev/v4/errors"
@@ -71,7 +71,7 @@ func TestPermissionsListAccounts(t *testing.T) {
query string
permissionError error
}{
// TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged
// TODO: remove this test when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged
// replace with two tests:
// 1: "ListAccounts fails with 403 when roleIDs don't exist in context"
// 2: "ListAccounts fails with 403 when ('no admin role in context' AND 'empty query')"
@@ -118,7 +118,7 @@ func TestPermissionsListAccounts(t *testing.T) {
}
// TestPermissionsGetAccount checks permission handling on GetAccount
// TODO: remove this test function entirely, when https://github.com/owncloud/ocis/accounts/pull/111 is merged. GetAccount will not have permission checks for the time being.
// TODO: remove this test function entirely, when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged. GetAccount will not have permission checks for the time being.
func TestPermissionsGetAccount(t *testing.T) {
var scenarios = []struct {
name string
@@ -169,7 +169,7 @@ func TestPermissionsCreateAccount(t *testing.T) {
roleIDs []string
permissionError error
}{
// TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged
// TODO: remove this test when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged
// replace with two tests:
// 1: "CreateAccount fails with 403 when roleIDs don't exist in context"
// 2: "CreateAccount fails with 403 when no admin role in context"
@@ -217,7 +217,7 @@ func TestPermissionsUpdateAccount(t *testing.T) {
roleIDs []string
permissionError error
}{
// TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged
// TODO: remove this test when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged
// replace with two tests:
// 1: "UpdateAccount fails with 403 when roleIDs don't exist in context"
// 2: "UpdateAccount fails with 403 when no admin role in context"
@@ -265,7 +265,7 @@ func TestPermissionsDeleteAccount(t *testing.T) {
roleIDs []string
permissionError error
}{
// TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged
// TODO: remove this test when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged
// replace with two tests:
// 1: "DeleteAccount fails with 403 when roleIDs don't exist in context"
// 2: "DeleteAccount fails with 403 when no admin role in context"

View File

@@ -5,12 +5,12 @@ import (
"path"
"strconv"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/gofrs/uuid"
"github.com/golang/protobuf/ptypes/empty"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage"
merrors "go-micro.dev/v4/errors"
p "google.golang.org/protobuf/proto"
)

View File

@@ -4,14 +4,14 @@ import (
"context"
"fmt"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage"
"github.com/owncloud/ocis/ocis-pkg/indexer"
"github.com/owncloud/ocis/ocis-pkg/indexer/config"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/config"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer/option"
)
// RebuildIndex deletes all indices (in memory and on storage) and rebuilds them from scratch.

View File

@@ -1,10 +1,10 @@
package service
import (
"github.com/owncloud/ocis/extensions/accounts/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/accounts/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.

View File

@@ -3,12 +3,12 @@ package service
import (
"context"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/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/v2/extensions/settings/pkg/service/v0"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
const (

View File

@@ -8,21 +8,21 @@ import (
"strings"
"time"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
"github.com/pkg/errors"
"github.com/owncloud/ocis/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
"github.com/owncloud/ocis/ocis-pkg/indexer"
idxcfg "github.com/owncloud/ocis/ocis-pkg/indexer/config"
idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage"
"github.com/owncloud/ocis/v2/ocis-pkg/indexer"
idxcfg "github.com/owncloud/ocis/v2/ocis-pkg/indexer/config"
idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
oreg "github.com/owncloud/ocis/ocis-pkg/registry"
"github.com/owncloud/ocis/ocis-pkg/roles"
settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
oreg "github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
)
// userDefaultGID is the default integer representing the "users" group.

View File

@@ -15,10 +15,10 @@ import (
"github.com/cs3org/reva/v2/pkg/token"
"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
olog "github.com/owncloud/ocis/ocis-pkg/log"
metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
metadatastorage "github.com/owncloud/ocis/v2/ocis-pkg/metadata_storage"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
"google.golang.org/grpc/metadata"
)

View File

@@ -4,8 +4,8 @@ package storage
//import (
// "context"
// accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
// "github.com/owncloud/ocis/accounts/pkg/config"
// accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
// "github.com/owncloud/ocis/v2/accounts/pkg/config"
// "github.com/stretchr/testify/assert"
// "testing"
//)

View File

@@ -8,10 +8,10 @@ import (
"path/filepath"
"sync"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
olog "github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
olog "github.com/owncloud/ocis/v2/ocis-pkg/log"
)
var groupLock sync.Mutex

View File

@@ -3,7 +3,7 @@ package storage
import (
"context"
accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0"
)
const (

View File

@@ -1,8 +1,8 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/accounts/pkg/config"
pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/app-provider/pkg/command"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/command"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/defaults"
)
func main() {

View File

@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config/parser"
"github.com/owncloud/ocis/extensions/app-provider/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/logging"
"github.com/urfave/cli/v2"
)

View File

@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)

View File

@@ -9,15 +9,15 @@ import (
"github.com/cs3org/reva/v2/cmd/revad/runtime"
"github.com/gofrs/uuid"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config/parser"
"github.com/owncloud/ocis/extensions/app-provider/pkg/logging"
"github.com/owncloud/ocis/extensions/app-provider/pkg/revaconfig"
"github.com/owncloud/ocis/extensions/app-provider/pkg/server/debug"
"github.com/owncloud/ocis/extensions/app-provider/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/service/external"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/revaconfig"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)

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/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/urfave/cli/v2"
)

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"
)
type Config struct {

View File

@@ -1,8 +1,8 @@
package defaults
import (
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
)
func FullDefaultConfig() *config.Config {

View File

@@ -3,12 +3,12 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-provider/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.

View File

@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.

View File

@@ -1,7 +1,7 @@
package revaconfig
import (
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
)
// AppProviderConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.

View File

@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.

View File

@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/app-provider/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.

View File

@@ -1,9 +1,9 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/app-registry/pkg/command"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/command"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/defaults"
)
func main() {

View File

@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config/parser"
"github.com/owncloud/ocis/extensions/app-registry/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/logging"
"github.com/urfave/cli/v2"
)

View File

@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)

View File

@@ -9,14 +9,14 @@ import (
"github.com/cs3org/reva/v2/cmd/revad/runtime"
"github.com/gofrs/uuid"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config/parser"
"github.com/owncloud/ocis/extensions/app-registry/pkg/logging"
"github.com/owncloud/ocis/extensions/app-registry/pkg/revaconfig"
"github.com/owncloud/ocis/extensions/app-registry/pkg/server/debug"
"github.com/owncloud/ocis/extensions/app-registry/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/service/external"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/revaconfig"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)

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/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
"github.com/urfave/cli/v2"
)

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"
)
type Config struct {

View File

@@ -1,7 +1,7 @@
package defaults
import (
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
)
func FullDefaultConfig() *config.Config {

View File

@@ -3,12 +3,12 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-registry/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.

View File

@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.

View File

@@ -1,10 +1,10 @@
package revaconfig
import (
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/mitchellh/mapstructure"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
)
// AppRegistryConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.

View File

@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.

View File

@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/app-registry/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.

View File

@@ -1,9 +1,9 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/audit/pkg/command"
"github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/command"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config/defaults"
)
func main() {

View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
"github.com/urfave/cli/v2"
)

View File

@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)

View File

@@ -7,11 +7,11 @@ import (
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/events/server"
"github.com/go-micro/plugins/v4/events/natsjs"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config/parser"
"github.com/owncloud/ocis/extensions/audit/pkg/logging"
svc "github.com/owncloud/ocis/extensions/audit/pkg/service"
"github.com/owncloud/ocis/extensions/audit/pkg/types"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/logging"
svc "github.com/owncloud/ocis/v2/extensions/audit/pkg/service"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/types"
"github.com/urfave/cli/v2"
)

View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
"github.com/urfave/cli/v2"
)

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.

View File

@@ -1,7 +1,7 @@
package defaults
import (
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
)
func FullDefaultConfig() *config.Config {

View File

@@ -3,11 +3,11 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.

View File

@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.

View File

@@ -7,9 +7,9 @@ import (
"os"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/owncloud/ocis/extensions/audit/pkg/config"
"github.com/owncloud/ocis/extensions/audit/pkg/types"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/config"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/types"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Log is used to log to different outputs

View File

@@ -6,8 +6,8 @@ import (
"testing"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/owncloud/ocis/extensions/audit/pkg/types"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/types"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/test-go/testify/require"
group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/command"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/command"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/defaults"
)
func main() {

View File

@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config/parser"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/logging"
"github.com/urfave/cli/v2"
)

View File

@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)

View File

@@ -9,16 +9,16 @@ import (
"github.com/cs3org/reva/v2/cmd/revad/runtime"
"github.com/gofrs/uuid"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config/parser"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/logging"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/revaconfig"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/server/debug"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/ldap"
"github.com/owncloud/ocis/ocis-pkg/service/external"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/revaconfig"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/ldap"
"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)

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/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/urfave/cli/v2"
)

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"
)
type Config struct {

View File

@@ -3,8 +3,8 @@ package defaults
import (
"path/filepath"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
)
func FullDefaultConfig() *config.Config {

View File

@@ -3,12 +3,12 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-basic/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.

View File

@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.

View File

@@ -1,6 +1,6 @@
package revaconfig
import "github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
import "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
// AuthBasicConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
func AuthBasicConfigFromStruct(cfg *config.Config) map[string]interface{} {

View File

@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.

View File

@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/auth-basic/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.

View File

@@ -1,9 +1,9 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/command"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/command"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/defaults"
)
func main() {

View File

@@ -4,9 +4,9 @@ import (
"fmt"
"net/http"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/parser"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/logging"
"github.com/urfave/cli/v2"
)

View File

@@ -4,9 +4,9 @@ import (
"context"
"os"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
)

View File

@@ -9,15 +9,15 @@ import (
"github.com/cs3org/reva/v2/cmd/revad/runtime"
"github.com/gofrs/uuid"
"github.com/oklog/run"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/parser"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/logging"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/revaconfig"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/server/debug"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/service/external"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/parser"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/logging"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/revaconfig"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/server/debug"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/urfave/cli/v2"
)

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/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
"github.com/urfave/cli/v2"
)

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"
)
type Config struct {

View File

@@ -1,7 +1,7 @@
package defaults
import (
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
)
func FullDefaultConfig() *config.Config {

View File

@@ -3,12 +3,12 @@ package parser
import (
"errors"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/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.

View File

@@ -1,8 +1,8 @@
package logging
import (
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// LoggerFromConfig initializes a service-specific logger instance.

View File

@@ -1,6 +1,6 @@
package revaconfig
import "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
import "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
// AuthBearerConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.
func AuthBearerConfigFromStruct(cfg *config.Config) map[string]interface{} {

View File

@@ -3,8 +3,8 @@ package debug
import (
"context"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
)
// Option defines a single option function.

View File

@@ -4,9 +4,9 @@ import (
"io"
"net/http"
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/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.

View File

@@ -1,9 +1,9 @@
package tracing
import (
"github.com/owncloud/ocis/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"go.opentelemetry.io/otel/trace"
)

View File

@@ -3,8 +3,8 @@ package main
import (
"os"
"github.com/owncloud/ocis/extensions/auth-machine/pkg/command"
"github.com/owncloud/ocis/extensions/auth-machine/pkg/config/defaults"
"github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/command"
"github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config/defaults"
)
func main() {

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