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/notifications/pkg/channels/channels.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/pkg/errors"
mail "github.com/xhit/go-simple-mail/v2"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config"
)
services/notifications/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/notifications/pkg/config"
"github.com/urfave/cli/v2"
)
services/notifications/pkg/command/server.go
+6 -5
View File
@@ -3,10 +3,11 @@ package command
import (
"context"
"fmt"
"reflect"
"github.com/cs3org/reva/v2/pkg/store"
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
microstore "go-micro.dev/v4/store"
"reflect"
"github.com/oklog/run"
"github.com/urfave/cli/v2"
@@ -15,10 +16,10 @@ import (
"github.com/cs3org/reva/v2/pkg/events/stream"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
"github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
"github.com/opencloud-eu/opencloud/ocis-pkg/tracing"
"github.com/opencloud-eu/opencloud/pkg/config/configlog"
"github.com/opencloud-eu/opencloud/pkg/registry"
"github.com/opencloud-eu/opencloud/pkg/service/grpc"
"github.com/opencloud-eu/opencloud/pkg/tracing"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/channels"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config"
services/notifications/pkg/config/config.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"context"
"time"
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/shared"
)
// Config combines all available configuration parts.
services/notifications/pkg/config/defaults/defaultconfig.go
+4 -3
View File
@@ -1,10 +1,11 @@
package defaults
import (
"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
"github.com/opencloud-eu/opencloud/ocis-pkg/structs"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config"
"time"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/structs"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config"
)
// FullDefaultConfig returns a fully initialized default configuration
services/notifications/pkg/config/parser/parse.go
+3 -3
View File
@@ -6,13 +6,13 @@ import (
"net/mail"
"strings"
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/notifications/pkg/config"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/logging"
"github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
)
// ParseConfig loads configuration from known paths.
services/notifications/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/notifications/pkg/email/composer.go
+3 -2
View File
@@ -3,11 +3,12 @@ package email
import (
"bytes"
"embed"
"github.com/pkg/errors"
"strings"
"text/template"
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
"github.com/pkg/errors"
"github.com/opencloud-eu/opencloud/pkg/l10n"
)
var (
services/notifications/pkg/email/templates.go
+1 -1
View File
@@ -1,6 +1,6 @@
package email
import "github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
import "github.com/opencloud-eu/opencloud/pkg/l10n"
const (
_textTemplate = "templates/text/email.text.tmpl"
services/notifications/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/notifications/pkg/config"
)
services/notifications/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/notifications/pkg/config"
)
services/notifications/pkg/server/debug/server.go
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"net/http"
"strconv"
"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/notifications/pkg/service/filter.go
+3 -2
View File
@@ -3,9 +3,10 @@ package service
import (
"context"
"errors"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/middleware"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
micrometadata "go-micro.dev/v4/metadata"
)
services/notifications/pkg/service/filter_test.go
+3 -2
View File
@@ -2,14 +2,15 @@ package service
import (
"context"
"testing"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/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"
"testing"
)
var testLogger = log.NewLogger()
services/notifications/pkg/service/job.go
+2 -1
View File
@@ -2,8 +2,9 @@ package service
import (
"context"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/opencloud-eu/opencloud/ocis-pkg/l10n"
"github.com/opencloud-eu/opencloud/pkg/l10n"
ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/channels"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/email"
services/notifications/pkg/service/notification_suite_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package service_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/notifications/pkg/service/persistence.go
+2 -1
View File
@@ -3,8 +3,9 @@ package service
import (
"context"
"encoding/json"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/pkg/log"
v0 "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/pkg/errors"
services/notifications/pkg/service/service.go
+6 -5
View File
@@ -4,8 +4,6 @@ import (
"context"
"errors"
"fmt"
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
"go-micro.dev/v4/store"
"net/url"
"os"
"os/signal"
@@ -13,6 +11,9 @@ import (
"strings"
"syscall"
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0"
"go-micro.dev/v4/store"
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
@@ -24,9 +25,9 @@ import (
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"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/pkg/l10n"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/middleware"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/channels"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/email"
services/notifications/pkg/service/service_test.go
+4 -3
View File
@@ -2,9 +2,10 @@ package service_test
import (
"context"
"time"
"github.com/cs3org/reva/v2/pkg/store"
settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0"
"time"
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
@@ -16,8 +17,8 @@ import (
cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"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"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/channels"
services/notifications/pkg/service/splitter.go
+3 -2
View File
@@ -2,9 +2,10 @@ package service
import (
"context"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/pkg/middleware"
settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
"github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults"
"github.com/pkg/errors"
services/notifications/pkg/service/splitter_test.go
+4 -3
View File
@@ -2,16 +2,17 @@ package service
import (
"context"
"strings"
"testing"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
"github.com/opencloud-eu/opencloud/ocis-pkg/log"
"github.com/opencloud-eu/opencloud/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"
v0 "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"
"strings"
"testing"
)
func Test_intervalSplitter_execute(t *testing.T) {