mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-01-06 04:09:40 -06:00
change module name
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
@@ -6,8 +6,8 @@ import (
|
||||
"os/signal"
|
||||
"syscall"
|
||||
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/command"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config/defaults"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/command"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
"github.com/urfave/cli/v2"
|
||||
)
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ package command
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/clihelper"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
"github.com/urfave/cli/v2"
|
||||
)
|
||||
|
||||
|
||||
@@ -12,19 +12,19 @@ import (
|
||||
"github.com/urfave/cli/v2"
|
||||
microstore "go-micro.dev/v4/store"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
|
||||
ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/version"
|
||||
ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0"
|
||||
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config/parser"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/logging"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/metrics"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/server/debug"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/server/http"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
|
||||
ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
|
||||
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
|
||||
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config/parser"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/logging"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/metrics"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/server/debug"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/server/http"
|
||||
)
|
||||
|
||||
// all events we care about
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
"github.com/urfave/cli/v2"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
|
||||
)
|
||||
|
||||
// Config combines all available configuration parts.
|
||||
|
||||
@@ -4,9 +4,9 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/structs"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/structs"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
)
|
||||
|
||||
// FullDefaultConfig returns the full default config
|
||||
|
||||
@@ -3,12 +3,12 @@ package parser
|
||||
import (
|
||||
"errors"
|
||||
|
||||
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config/defaults"
|
||||
ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
|
||||
)
|
||||
|
||||
// ParseConfig loads configuration from known paths.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package config
|
||||
|
||||
import "github.com/owncloud/ocis/v2/ocis-pkg/tracing"
|
||||
import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
|
||||
|
||||
// Tracing defines the available tracing configuration.
|
||||
type Tracing struct {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package logging
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
)
|
||||
|
||||
// Configure initializes a service-specific logger instance.
|
||||
|
||||
@@ -3,8 +3,8 @@ package debug
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
)
|
||||
|
||||
// Option defines a single option function.
|
||||
|
||||
@@ -3,10 +3,10 @@ package debug
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/checks"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/handlers"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/version"
|
||||
"github.com/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"
|
||||
)
|
||||
|
||||
// Server initializes the debug service and server.
|
||||
|
||||
@@ -6,11 +6,11 @@ import (
|
||||
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
|
||||
"github.com/cs3org/reva/v2/pkg/events"
|
||||
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
||||
ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0"
|
||||
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/metrics"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
|
||||
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
|
||||
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/metrics"
|
||||
"github.com/urfave/cli/v2"
|
||||
"go-micro.dev/v4/store"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
@@ -7,13 +7,13 @@ import (
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
chimiddleware "github.com/go-chi/chi/v5/middleware"
|
||||
"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/tracing"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/version"
|
||||
svc "github.com/owncloud/ocis/v2/services/userlog/pkg/service"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/account"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/cors"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/service/http"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
|
||||
svc "github.com/opencloud-eu/opencloud/services/userlog/pkg/service"
|
||||
"github.com/riandyrn/otelchi"
|
||||
"go-micro.dev/v4"
|
||||
)
|
||||
|
||||
@@ -18,7 +18,7 @@ import (
|
||||
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
|
||||
"github.com/cs3org/reva/v2/pkg/storagespace"
|
||||
"github.com/cs3org/reva/v2/pkg/utils"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/l10n"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
|
||||
)
|
||||
|
||||
//go:embed l10n/locale
|
||||
|
||||
@@ -5,10 +5,10 @@ import (
|
||||
"errors"
|
||||
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
|
||||
"github.com/cs3org/reva/v2/pkg/events"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/middleware"
|
||||
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
|
||||
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults"
|
||||
micrometadata "go-micro.dev/v4/metadata"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,9 +4,9 @@ import (
|
||||
"context"
|
||||
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
|
||||
"github.com/cs3org/reva/v2/pkg/events"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
||||
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
|
||||
settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
|
||||
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/pkg/errors"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"go-micro.dev/v4/client"
|
||||
|
||||
@@ -9,9 +9,9 @@ import (
|
||||
"github.com/cs3org/reva/v2/pkg/appctx"
|
||||
revactx "github.com/cs3org/reva/v2/pkg/ctx"
|
||||
"github.com/cs3org/reva/v2/pkg/utils"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
|
||||
"github.com/owncloud/ocis/v2/services/graph/pkg/errorcode"
|
||||
settings "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/roles"
|
||||
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
|
||||
settings "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0"
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@ import (
|
||||
"github.com/cs3org/reva/v2/pkg/events"
|
||||
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
||||
ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0"
|
||||
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
|
||||
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
|
||||
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
"go-micro.dev/v4/store"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
)
|
||||
|
||||
@@ -17,13 +17,13 @@ import (
|
||||
"go-micro.dev/v4/store"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/l10n"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/roles"
|
||||
ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0"
|
||||
ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0"
|
||||
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/roles"
|
||||
ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0"
|
||||
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
|
||||
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
)
|
||||
|
||||
// UserlogService is the service responsible for user activities
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
mRegistry "go-micro.dev/v4/registry"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -3,7 +3,7 @@ package service_test
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
|
||||
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
|
||||
"reflect"
|
||||
"time"
|
||||
|
||||
@@ -27,13 +27,13 @@ import (
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
"google.golang.org/grpc"
|
||||
|
||||
"github.com/owncloud/ocis/v2/ocis-pkg/log"
|
||||
ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0"
|
||||
ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0"
|
||||
"github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0/mocks"
|
||||
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/config"
|
||||
"github.com/owncloud/ocis/v2/services/userlog/pkg/service"
|
||||
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
|
||||
ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0"
|
||||
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
|
||||
"github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0/mocks"
|
||||
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
|
||||
"github.com/opencloud-eu/opencloud/services/userlog/pkg/service"
|
||||
)
|
||||
|
||||
var _ = Describe("UserlogService", func() {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package service
|
||||
|
||||
import "github.com/owncloud/ocis/v2/ocis-pkg/l10n"
|
||||
import "github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
|
||||
|
||||
// the available templates
|
||||
var (
|
||||
|
||||
Reference in New Issue
Block a user