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/settings/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/settings/pkg/config"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config/parser"
"github.com/opencloud-eu/opencloud/services/settings/pkg/logging"
services/settings/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/opencloud-eu/opencloud/services/settings/pkg/config"
"github.com/urfave/cli/v2"
)
services/settings/pkg/command/server.go
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"fmt"
"github.com/oklog/run"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
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"
"github.com/opencloud-eu/opencloud/pkg/config/configlog"
ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc"
"github.com/opencloud-eu/opencloud/pkg/tracing"
"github.com/opencloud-eu/opencloud/pkg/version"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config/parser"
"github.com/opencloud-eu/opencloud/services/settings/pkg/logging"
services/settings/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/settings/pkg/config"
services/settings/pkg/config/config.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"time"
"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"
"go-micro.dev/v4/client"
)
services/settings/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"time"
"github.com/opencloud-eu/opencloud/ocis-pkg/structs"
"github.com/opencloud-eu/opencloud/pkg/structs"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config"
rdefaults "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults"
"github.com/pkg/errors"
services/settings/pkg/config/grpc.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"
// GRPCConfig defines the available grpc configuration.
type GRPCConfig struct {
services/settings/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/settings/pkg/config/parser/parse.go
+3 -3
View File
@@ -3,12 +3,12 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.
services/settings/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/settings/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/settings/pkg/config"
)
services/settings/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/settings/pkg/config"
)
services/settings/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/settings/pkg/server/grpc/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package grpc
import (
"context"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config"
"github.com/opencloud-eu/opencloud/services/settings/pkg/metrics"
"github.com/opencloud-eu/opencloud/services/settings/pkg/settings"
services/settings/pkg/server/grpc/server.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"context"
permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1"
"github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
"github.com/opencloud-eu/opencloud/ocis-pkg/version"
"github.com/opencloud-eu/opencloud/pkg/service/grpc"
"github.com/opencloud-eu/opencloud/pkg/version"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"go-micro.dev/v4/api"
"go-micro.dev/v4/server"
services/settings/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/settings/pkg/config"
"github.com/opencloud-eu/opencloud/services/settings/pkg/metrics"
"github.com/opencloud-eu/opencloud/services/settings/pkg/settings"
services/settings/pkg/server/http/server.go
+6 -6
View File
@@ -6,12 +6,12 @@ import (
"github.com/go-chi/chi/v5"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/opencloud-eu/opencloud/ocis-pkg/account"
"github.com/opencloud-eu/opencloud/ocis-pkg/cors"
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
ohttp "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"
"github.com/opencloud-eu/opencloud/pkg/account"
"github.com/opencloud-eu/opencloud/pkg/cors"
"github.com/opencloud-eu/opencloud/pkg/middleware"
ohttp "github.com/opencloud-eu/opencloud/pkg/service/http"
"github.com/opencloud-eu/opencloud/pkg/tracing"
"github.com/opencloud-eu/opencloud/pkg/version"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/riandyrn/otelchi"
"go-micro.dev/v4"
services/settings/pkg/service/v0/option.go
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config"
)
services/settings/pkg/service/v0/service.go
+4 -4
View File
@@ -12,10 +12,10 @@ import (
ctxpkg "github.com/cs3org/reva/v2/pkg/ctx"
"github.com/cs3org/reva/v2/pkg/rgrpc/status"
"github.com/leonelquinteros/gotext"
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"github.com/opencloud-eu/opencloud/ocis-pkg/roles"
"github.com/opencloud-eu/opencloud/pkg/l10n"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/middleware"
"github.com/opencloud-eu/opencloud/pkg/roles"
settingsmsg "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/settings/pkg/config"
services/settings/pkg/service/v0/service_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"net/http"
"testing"
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"github.com/opencloud-eu/opencloud/pkg/middleware"
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/settings/pkg/settings/mocks"
services/settings/pkg/store/defaults/templates.go
+1 -1
View File
@@ -1,6 +1,6 @@
package defaults
import "github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
import "github.com/opencloud-eu/opencloud/pkg/l10n"
// Translatable configuration options
var (
services/settings/pkg/store/metadata/assignments_test.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"testing"
"github.com/gofrs/uuid"
olog "github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
olog "github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/shared"
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults"
"github.com/stretchr/testify/require"
services/settings/pkg/store/metadata/cache.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"path"
"github.com/cs3org/reva/v2/pkg/store"
olog "github.com/opencloud-eu/opencloud/ocis-pkg/log"
olog "github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config"
"github.com/shamaton/msgpack/v2"
microstore "go-micro.dev/v4/store"
services/settings/pkg/store/metadata/store.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/cs3org/reva/v2/pkg/errtypes"
"github.com/cs3org/reva/v2/pkg/storage/utils/metadata"
"github.com/gofrs/uuid"
olog "github.com/opencloud-eu/opencloud/ocis-pkg/log"
olog "github.com/opencloud-eu/opencloud/pkg/log"
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config"
"github.com/opencloud-eu/opencloud/services/settings/pkg/settings"