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

chore: replace interface with any

Browse Source
This commit is contained in:
Florian Schade
2026-04-23 09:31:11 +02:00
committed by Ralf Haferkamp
parent 8f26149743
commit 288e67cc39
138 changed files with 933 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/activitylog/pkg/server/http/server.go
+1 -1
View File
@@ -19,7 +19,7 @@ import (
)
// Service is the service interface
type Service interface{}
type Service any
// Server initializes the http service and server.
func Server(opts ...Option) (http.Service, error) {
services/activitylog/pkg/service/http.go
+3 -3
View File
@@ -18,12 +18,12 @@ import (
"github.com/opencloud-eu/reva/v2/pkg/utils"
"google.golang.org/grpc/metadata"
libregraph "github.com/opencloud-eu/libre-graph-api-go"
"github.com/opencloud-eu/opencloud/pkg/ast"
"github.com/opencloud-eu/opencloud/pkg/kql"
"github.com/opencloud-eu/opencloud/pkg/l10n"
ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/messages/eventhistory/v0"
ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/opencloud/services/eventhistory/v0"
libregraph "github.com/opencloud-eu/libre-graph-api-go"
)
var (
@@ -121,7 +121,7 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
var (
message string
ts time.Time
vars map[string]interface{}
vars map[string]any
)
loc := l10n.MustGetUserLocale(r.Context(), activeUser.GetId().GetOpaqueId(), r.Header.Get(l10n.HeaderAcceptLanguage), s.valService)
@@ -252,7 +252,7 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
w.WriteHeader(http.StatusOK)
}
func (s *ActivitylogService) unwrapEvent(e *ehmsg.Event) interface{} {
func (s *ActivitylogService) unwrapEvent(e *ehmsg.Event) any {
etype, ok := s.registeredEvents[e.GetType()]
if !ok {
s.log.Error().Str("eventid", e.GetId()).Str("eventtype", e.GetType()).Msg("event not registered")
services/activitylog/pkg/service/migrations.go
+3 -3
View File
@@ -54,9 +54,9 @@ func (a *ActivitylogService) migrateToV1(_ context.Context, kv nats.KeyValue) er
// keyValueEnvelope is the data structure used by the go micro plugin which was used previously.
type keyValueEnvelope struct {
Key string `json:"key"`
Data []byte `json:"data"`
Metadata map[string]interface{} `json:"metadata"`
Key string `json:"key"`
Data []byte `json:"data"`
Metadata map[string]any `json:"metadata"`
}
for key := range keyChan {
services/activitylog/pkg/service/response.go
+12 -12
View File
@@ -69,11 +69,11 @@ type Sharee struct {
}
// ActivityOption allows setting variables for an activity
type ActivityOption func(context.Context, gateway.GatewayAPIClient, map[string]interface{}) error
type ActivityOption func(context.Context, gateway.GatewayAPIClient, map[string]any) error
// WithResource sets the resource variable for an activity
func WithResource(ref *provider.Reference, addSpace bool, explicitResourceName string) ActivityOption {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]interface{}) error {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]any) error {
info, err := utils.GetResource(ctx, ref, gwc)
if err != nil {
if explicitResourceName == "" {
@@ -119,7 +119,7 @@ func WithResource(ref *provider.Reference, addSpace bool, explicitResourceName s
// WithOldResource sets the oldResource variable for an activity
func WithOldResource(ref *provider.Reference) ActivityOption {
return func(_ context.Context, _ gateway.GatewayAPIClient, vars map[string]interface{}) error {
return func(_ context.Context, _ gateway.GatewayAPIClient, vars map[string]any) error {
name := filepath.Base(ref.GetPath())
vars["oldResource"] = Resource{
Name: name,
@@ -130,7 +130,7 @@ func WithOldResource(ref *provider.Reference) ActivityOption {
// WithTrashedResource sets the resource variable if the resource is trashed
func WithTrashedResource(ref *provider.Reference, rid *provider.ResourceId) ActivityOption {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]interface{}) error {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]any) error {
vars["resource"] = Resource{
Name: filepath.Base(ref.GetPath()),
}
@@ -174,7 +174,7 @@ func WithTrashedResource(ref *provider.Reference, rid *provider.ResourceId) Acti
// WithUser sets the user variable for an Activity
func WithUser(uid *user.UserId, u *user.User, impersonator *user.User) ActivityOption {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]interface{}) error {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]any) error {
var target *user.User
switch {
case impersonator != nil:
@@ -206,7 +206,7 @@ func WithUser(uid *user.UserId, u *user.User, impersonator *user.User) ActivityO
// WithSharee sets the sharee variable for an activity
func WithSharee(uid *user.UserId, gid *group.GroupId) ActivityOption {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]interface{}) error {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]any) error {
switch {
case uid != nil:
u, err := utils.GetUserNoGroups(ctx, uid, gwc)
@@ -252,7 +252,7 @@ func WithSharee(uid *user.UserId, gid *group.GroupId) ActivityOption {
// WithSpace sets the space variable for an activity
func WithSpace(spaceid *provider.StorageSpaceId) ActivityOption {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]interface{}) error {
return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]any) error {
s, err := utils.GetSpace(ctx, spaceid.GetOpaqueId(), gwc)
if err != nil {
vars["space"] = Resource{
@@ -272,7 +272,7 @@ func WithSpace(spaceid *provider.StorageSpaceId) ActivityOption {
// WithTranslation sets a variable that translation is needed for
func WithTranslation(t *l10n.Translator, locale string, key string, values []string) ActivityOption {
return func(_ context.Context, _ gateway.GatewayAPIClient, vars map[string]interface{}) error {
return func(_ context.Context, _ gateway.GatewayAPIClient, vars map[string]any) error {
f := t.Translate(StrSomeField, locale)
if len(values) > 0 {
for i := range values {
@@ -289,7 +289,7 @@ func WithTranslation(t *l10n.Translator, locale string, key string, values []str
// WithVar sets a variable for an activity
func WithVar(key, id, name string) ActivityOption {
return func(_ context.Context, _ gateway.GatewayAPIClient, vars map[string]interface{}) error {
return func(_ context.Context, _ gateway.GatewayAPIClient, vars map[string]any) error {
vars[key] = Resource{
ID: id,
Name: name,
@@ -299,7 +299,7 @@ func WithVar(key, id, name string) ActivityOption {
}
// NewActivity creates a new activity
func NewActivity(message string, ts time.Time, eventID string, vars map[string]interface{}) libregraph.Activity {
func NewActivity(message string, ts time.Time, eventID string, vars map[string]any) libregraph.Activity {
return libregraph.Activity{
Id: eventID,
Times: libregraph.ActivityTimes{RecordedTime: ts},
@@ -311,13 +311,13 @@ func NewActivity(message string, ts time.Time, eventID string, vars map[string]i
}
// GetVars calls other service to gather the required data for the activity variables
func (s *ActivitylogService) GetVars(ctx context.Context, opts ...ActivityOption) (map[string]interface{}, error) {
func (s *ActivitylogService) GetVars(ctx context.Context, opts ...ActivityOption) (map[string]any, error) {
gwc, err := s.gws.Next()
if err != nil {
return nil, err
}
vars := make(map[string]interface{})
vars := make(map[string]any)
for _, opt := range opts {
if err := opt(ctx, gwc, vars); err != nil {
s.log.Info().Err(err).Msg("error getting activity vars")
services/activitylog/pkg/service/service_test.go
+1 -1
View File
@@ -268,7 +268,7 @@ var _ = Describe("ActivitylogService", func() {
})
})
func activitites(acts ...interface{}) []RawActivity {
func activitites(acts ...any) []RawActivity {
var activities []RawActivity
act := RawActivity{}
for _, a := range acts {