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
pkg/ast/ast.go
+1 -1
View File
@@ -91,7 +91,7 @@ func NodeKey(n Node) string {
}
// NodeValue tries to return the node key
func NodeValue(n Node) interface{} {
func NodeValue(n Node) any {
switch node := n.(type) {
case *StringNode:
return node.Value
pkg/ast/test/test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
// DiffAst returns a human-readable report of the differences between two values
// by default it ignores every ast node Base field.
func DiffAst(x, y interface{}, opts ...cmp.Option) string {
func DiffAst(x, y any, opts ...cmp.Option) string {
return cmp.Diff(
x,
y,
pkg/config/envdecode/envdecode.go
+6 -6
View File
@@ -58,7 +58,7 @@ type Decoder interface {
// time.ParseDuration() function and *url.URL is supported via the
// url.Parse() function. Slices are supported for all above mentioned
// primitive types. Semicolon is used as delimiter in environment variables.
func Decode(target interface{}) error {
func Decode(target any) error {
nFields, err := decode(target, false)
if err != nil {
return err
@@ -75,7 +75,7 @@ func Decode(target interface{}) error {
// StrictDecode is similar to Decode except all fields will have an implicit
// ",strict" on all fields.
func StrictDecode(target interface{}) error {
func StrictDecode(target any) error {
nFields, err := decode(target, true)
if err != nil {
return err
@@ -90,7 +90,7 @@ func StrictDecode(target interface{}) error {
return nil
}
func decode(target interface{}, strict bool) (int, error) {
func decode(target any, strict bool) (int, error) {
s := reflect.ValueOf(target)
if s.Kind() != reflect.Ptr || s.IsNil() {
return 0, ErrInvalidTarget
@@ -296,7 +296,7 @@ func decodePrimitiveType(f *reflect.Value, env string) error {
// MustDecode calls Decode and terminates the process if any errors
// are encountered.
func MustDecode(target interface{}) {
func MustDecode(target any) {
if err := Decode(target); err != nil {
FailureFunc(err)
}
@@ -304,7 +304,7 @@ func MustDecode(target interface{}) {
// MustStrictDecode calls StrictDecode and terminates the process if any errors
// are encountered.
func MustStrictDecode(target interface{}) {
func MustStrictDecode(target any) {
if err := StrictDecode(target); err != nil {
FailureFunc(err)
}
@@ -335,7 +335,7 @@ func (c ConfigInfoSlice) Swap(i, j int) {
}
// Returns a list of final configuration metadata sorted by envvar name
func Export(target interface{}) ([]*ConfigInfo, error) {
func Export(target any) ([]*ConfigInfo, error) {
s := reflect.ValueOf(target)
if s.Kind() != reflect.Ptr || s.IsNil() {
return nil, ErrInvalidTarget
pkg/config/envdecode/envdecode_test.go
+1 -1
View File
@@ -552,7 +552,7 @@ type testConfigStrict struct {
func TestInvalidStrict(t *testing.T) {
cases := []struct {
decoder func(interface{}) error
decoder func(any) error
rootValue string
nestedValue string
rootValueImplicit string
pkg/config/helpers.go
+2 -2
View File
@@ -19,13 +19,13 @@ var (
)
// BindSourcesToStructs assigns any config value from a config file / env variable to struct `dst`.
func BindSourcesToStructs(service string, dst interface{}) error {
func BindSourcesToStructs(service string, dst any) error {
fileSystem := os.DirFS("/")
filePath := strings.TrimLeft(path.Join(defaults.BaseConfigPath(), service+".yaml"), "/")
return bindSourcesToStructs(fileSystem, filePath, service, dst)
}
func bindSourcesToStructs(fileSystem fs.FS, filePath, service string, dst interface{}) error {
func bindSourcesToStructs(fileSystem fs.FS, filePath, service string, dst any) error {
cnf := gofig.NewWithOptions(service)
cnf.WithOptions(func(options *gofig.Options) {
options.ParseEnv = true
pkg/crypto/gencert.go
+5 -5
View File
@@ -63,7 +63,7 @@ func GenTempCertForAddr(addr string) (tls.Certificate, error) {
}
// persistCertificate generates a certificate using pk as private key and proceeds to store it into a file named certName.
func persistCertificate(certName string, l log.Logger, pk interface{}) error {
func persistCertificate(certName string, l log.Logger, pk any) error {
if err := ensureExistsDir(certName); err != nil {
return fmt.Errorf("creating certificate destination: %s", certName)
}
@@ -93,7 +93,7 @@ func persistCertificate(certName string, l log.Logger, pk interface{}) error {
}
// genCert generates a self signed certificate using a random rsa key.
func generateCertificate(pk interface{}) ([]byte, error) {
func generateCertificate(pk any) ([]byte, error) {
for _, h := range defaultHosts {
if ip := net.ParseIP(h); ip != nil {
acmeTemplate.IPAddresses = append(acmeTemplate.IPAddresses, ip)
@@ -106,7 +106,7 @@ func generateCertificate(pk interface{}) ([]byte, error) {
}
// persistKey persists the private key used to generate the certificate at the configured location.
func persistKey(destination string, l log.Logger, pk interface{}) error {
func persistKey(destination string, l log.Logger, pk any) error {
if err := ensureExistsDir(destination); err != nil {
return fmt.Errorf("creating key destination: %s", destination)
}
@@ -129,7 +129,7 @@ func persistKey(destination string, l log.Logger, pk interface{}) error {
return nil
}
func publicKey(pk interface{}) interface{} {
func publicKey(pk any) any {
switch k := pk.(type) {
case *rsa.PrivateKey:
return &k.PublicKey
@@ -140,7 +140,7 @@ func publicKey(pk interface{}) interface{} {
}
}
func pemBlockForKey(pk interface{}, l log.Logger) *pem.Block {
func pemBlockForKey(pk any, l log.Logger) *pem.Block {
switch k := pk.(type) {
case *rsa.PrivateKey:
return &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(k)}
pkg/crypto/gencert_test.go
+2 -2
View File
@@ -58,7 +58,7 @@ func TestPersistKey(t *testing.T) {
type args struct {
keyName string
pk interface{}
pk any
}
tests := []struct {
name string
@@ -104,7 +104,7 @@ func TestPersistCertificate(t *testing.T) {
type args struct {
certName string
pk interface{}
pk any
}
tests := []struct {
name string
pkg/kql/cast.go
+7 -7
View File
@@ -9,7 +9,7 @@ import (
"github.com/opencloud-eu/opencloud/services/search/pkg/query"
)
func toNode[T ast.Node](in interface{}) (T, error) {
func toNode[T ast.Node](in any) (T, error) {
var t T
out, ok := in.(T)
if !ok {
@@ -19,7 +19,7 @@ func toNode[T ast.Node](in interface{}) (T, error) {
return out, nil
}
func toNodes[T ast.Node](in interface{}) ([]T, error) {
func toNodes[T ast.Node](in any) ([]T, error) {
switch v := in.(type) {
case T:
return []T{v}, nil
@@ -27,7 +27,7 @@ func toNodes[T ast.Node](in interface{}) ([]T, error) {
return v, nil
case []*ast.OperatorNode, []*ast.DateTimeNode:
return toNodes[T](v)
case []interface{}:
case []any:
var nodes []T
for _, el := range v {
node, err := toNodes[T](el)
@@ -46,11 +46,11 @@ func toNodes[T ast.Node](in interface{}) ([]T, error) {
}
}
func toString(in interface{}) (string, error) {
func toString(in any) (string, error) {
switch v := in.(type) {
case []byte:
return string(v), nil
case []interface{}:
case []any:
var str string
for i := range v {
@@ -70,7 +70,7 @@ func toString(in interface{}) (string, error) {
}
}
func toTime(in interface{}) (time.Time, error) {
func toTime(in any) (time.Time, error) {
ts, err := toString(in)
if err != nil {
return time.Time{}, err
@@ -79,7 +79,7 @@ func toTime(in interface{}) (time.Time, error) {
return now.Parse(ts)
}
func toTimeRange(in interface{}) (*time.Time, *time.Time, error) {
func toTimeRange(in any) (*time.Time, *time.Time, error) {
var from, to time.Time
value, err := toString(in)
pkg/kql/factory.go
+6 -6
View File
@@ -27,7 +27,7 @@ func base(text []byte, pos position) (*ast.Base, error) {
}, nil
}
func buildAST(n interface{}, text []byte, pos position) (*ast.Ast, error) {
func buildAST(n any, text []byte, pos position) (*ast.Ast, error) {
b, err := base(text, pos)
if err != nil {
return nil, err
@@ -50,7 +50,7 @@ func buildAST(n interface{}, text []byte, pos position) (*ast.Ast, error) {
return a, nil
}
func buildStringNode(k, v interface{}, text []byte, pos position) (*ast.StringNode, error) {
func buildStringNode(k, v any, text []byte, pos position) (*ast.StringNode, error) {
b, err := base(text, pos)
if err != nil {
return nil, err
@@ -73,7 +73,7 @@ func buildStringNode(k, v interface{}, text []byte, pos position) (*ast.StringNo
}, nil
}
func buildDateTimeNode(k, o, v interface{}, text []byte, pos position) (*ast.DateTimeNode, error) {
func buildDateTimeNode(k, o, v any, text []byte, pos position) (*ast.DateTimeNode, error) {
b, err := base(text, pos)
if err != nil {
return nil, err
@@ -101,7 +101,7 @@ func buildDateTimeNode(k, o, v interface{}, text []byte, pos position) (*ast.Dat
Value: value,
}, nil
}
func buildNaturalLanguageDateTimeNodes(k, v interface{}, text []byte, pos position) ([]ast.Node, error) {
func buildNaturalLanguageDateTimeNodes(k, v any, text []byte, pos position) ([]ast.Node, error) {
b, err := base(text, pos)
if err != nil {
return nil, err
@@ -135,7 +135,7 @@ func buildNaturalLanguageDateTimeNodes(k, v interface{}, text []byte, pos positi
}
func buildBooleanNode(k, v interface{}, text []byte, pos position) (*ast.BooleanNode, error) {
func buildBooleanNode(k, v any, text []byte, pos position) (*ast.BooleanNode, error) {
b, err := base(text, pos)
if err != nil {
return nil, err
@@ -182,7 +182,7 @@ func buildOperatorNode(text []byte, pos position) (*ast.OperatorNode, error) {
}, nil
}
func buildGroupNode(k, n interface{}, text []byte, pos position) (*ast.GroupNode, error) {
func buildGroupNode(k, n any, text []byte, pos position) (*ast.GroupNode, error) {
b, err := base(text, pos)
if err != nil {
return nil, err
pkg/l10n/l10n_test.go
+2 -2
View File
@@ -389,8 +389,8 @@ func TestTranslateStruct(t *testing.T) {
}
}
func mock() func(string, ...interface{}) string {
return func(s string, i ...interface{}) string {
func mock() func(string, ...any) string {
return func(s string, i ...any) string {
switch s {
case "description":
return "new Description"
pkg/log/log.go
+1 -1
View File
@@ -37,7 +37,7 @@ func setMicroLogger() {
}
logger.DefaultLogger = mzlog.NewLogger(
logger.WithLevel(logger.Level(lev)),
logger.WithFields(map[string]interface{}{
logger.WithFields(map[string]any{
"system": "go-micro",
}),
)
pkg/log/logrus_wrapper.go
+2 -2
View File
@@ -53,8 +53,8 @@ func (h *LogrusWrapper) Fire(entry *logrus.Entry) error {
}
// Convert logrus fields to zerolog
func zeroLogFields(fields logrus.Fields) map[string]interface{} {
fm := make(map[string]interface{})
func zeroLogFields(fields logrus.Fields) map[string]any {
fm := make(map[string]any)
for k, v := range fields {
fm[k] = v
}
pkg/middleware/account.go
+1 -1
View File
@@ -33,7 +33,7 @@ const RoleIDs string = "Role-Ids"
// and write it to the context. If there is no x-access-token the middleware is omitted.
func ExtractAccountUUID(opts ...account.Option) func(http.Handler) http.Handler {
opt := newAccountOptions(opts...)
tokenManager, err := jwt.New(map[string]interface{}{
tokenManager, err := jwt.New(map[string]any{
"secret": opt.JWTSecret,
"expires": int64(24 * 60 * 60),
})
pkg/middleware/oidc.go
+1 -1
View File
@@ -82,7 +82,7 @@ func OidcAuth(opts ...Option) func(http.Handler) http.Handler {
w.WriteHeader(http.StatusUnauthorized)
return
}
claims := map[string]interface{}{}
claims := map[string]any{}
err = userInfo.Claims(&claims)
if err != nil {
break
pkg/oidc/claims.go
+5 -5
View File
@@ -33,14 +33,14 @@ func SplitWithEscaping(s string, separator string, escapeString string) []string
}
// WalkSegments uses the given array of segments to walk the claims and return whatever interface was found
func WalkSegments(segments []string, claims map[string]interface{}) (interface{}, error) {
func WalkSegments(segments []string, claims map[string]any) (any, error) {
i := 0
for ; i < len(segments)-1; i++ {
switch castedClaims := claims[segments[i]].(type) {
case map[string]interface{}:
case map[string]any:
claims = castedClaims
case map[interface{}]interface{}:
claims = make(map[string]interface{}, len(castedClaims))
case map[any]any:
claims = make(map[string]any, len(castedClaims))
for k, v := range castedClaims {
if s, ok := k.(string); ok {
claims[s] = v
@@ -56,7 +56,7 @@ func WalkSegments(segments []string, claims map[string]interface{}) (interface{}
}
// ReadStringClaim returns the string obtained by following the . seperated path in the claims
func ReadStringClaim(path string, claims map[string]interface{}) (string, error) {
func ReadStringClaim(path string, claims map[string]any) (string, error) {
// check the simple case first
value, _ := claims[path].(string)
if value != "" {
pkg/oidc/claims_test.go
+13 -13
View File
@@ -87,9 +87,9 @@ type walkSegmentsTest struct {
segments []string
// seperator to use
claims map[string]interface{}
claims map[string]any
expected interface{}
expected any
wantErr bool
}
@@ -109,7 +109,7 @@ func (wst walkSegmentsTest) run(t *testing.T) {
func TestWalkSegments(t *testing.T) {
byt := []byte(`{"first":{"second":{"third":["value1","value2"]},"foo":"bar"},"fizz":"buzz"}`)
var dat map[string]interface{}
var dat map[string]any
if err := json.Unmarshal(byt, &dat); err != nil {
t.Errorf("%v", err)
}
@@ -118,7 +118,7 @@ func TestWalkSegments(t *testing.T) {
{
name: "one segment, single value",
segments: []string{"first"},
claims: map[string]interface{}{
claims: map[string]any{
"first": "value",
},
expected: "value",
@@ -127,7 +127,7 @@ func TestWalkSegments(t *testing.T) {
{
name: "one segment, array value",
segments: []string{"first"},
claims: map[string]interface{}{
claims: map[string]any{
"first": []string{"value1", "value2"},
},
expected: []string{"value1", "value2"},
@@ -136,8 +136,8 @@ func TestWalkSegments(t *testing.T) {
{
name: "two segments, single value",
segments: []string{"first", "second"},
claims: map[string]interface{}{
"first": map[string]interface{}{
claims: map[string]any{
"first": map[string]any{
"second": "value",
},
},
@@ -147,8 +147,8 @@ func TestWalkSegments(t *testing.T) {
{
name: "two segments, array value",
segments: []string{"first", "second"},
claims: map[string]interface{}{
"first": map[string]interface{}{
claims: map[string]any{
"first": map[string]any{
"second": []string{"value1", "value2"},
},
},
@@ -159,15 +159,15 @@ func TestWalkSegments(t *testing.T) {
name: "three segments, array value from json",
segments: []string{"first", "second", "third"},
claims: dat,
expected: []interface{}{"value1", "value2"},
expected: []any{"value1", "value2"},
wantErr: false,
},
{
name: "three segments, array value with interface key",
segments: []string{"first", "second", "third"},
claims: map[string]interface{}{
"first": map[interface{}]interface{}{
"second": map[interface{}]interface{}{
claims: map[string]any{
"first": map[any]any{
"second": map[any]any{
"third": []string{"value1", "value2"},
},
},
pkg/oidc/client.go
+2 -2
View File
@@ -205,7 +205,7 @@ type userInfoRaw struct {
}
// Claims unmarshals the raw JSON object claims into the provided object.
func (u *UserInfo) Claims(v interface{}) error {
func (u *UserInfo) Claims(v any) error {
if u.claims == nil {
return errors.New("oidc: claims not set")
}
@@ -359,7 +359,7 @@ func (c *oidcClient) VerifyLogoutToken(ctx context.Context, rawToken string) (*L
return &claims, nil
}
func unmarshalResp(r *http.Response, body []byte, v interface{}) error {
func unmarshalResp(r *http.Response, body []byte, v any) error {
err := json.Unmarshal(body, &v)
if err == nil {
return nil
pkg/oidc/client_test.go
+7 -7
View File
@@ -12,7 +12,7 @@ import (
)
type signingKey struct {
priv interface{}
priv any
jwks *keyfunc.JWKS
}
@@ -27,7 +27,7 @@ func TestLogoutVerify(t *testing.T) {
"iat": 1471566154,
"jti": "bWJq",
"sid": "08a5019c-17e1-4977-8f42-65a12843ea02",
"events": map[string]interface{}{
"events": map[string]any{
"http://schemas.openid.net/event/backchannel-logout": struct{}{},
},
}),
@@ -39,7 +39,7 @@ func TestLogoutVerify(t *testing.T) {
logoutToken: jwt.NewWithClaims(jwt.SigningMethodRS256, jwt.MapClaims{
"iss": "https://foo1",
"sub": "248289761001",
"events": map[string]interface{}{
"events": map[string]any{
"http://schemas.openid.net/event/backchannel-logout": struct{}{},
},
}),
@@ -55,7 +55,7 @@ func TestLogoutVerify(t *testing.T) {
"iat": 1471566154,
"jti": "bWJq",
"sid": "08a5019c-17e1-4977-8f42-65a12843ea02",
"events": map[string]interface{}{
"events": map[string]any{
"http://schemas.openid.net/event/backchannel-logout": struct{}{},
},
}),
@@ -70,7 +70,7 @@ func TestLogoutVerify(t *testing.T) {
"aud": "s6BhdRkqt3",
"iat": 1471566154,
"jti": "bWJq",
"events": map[string]interface{}{
"events": map[string]any{
"http://schemas.openid.net/event/backchannel-logout": struct{}{},
},
}),
@@ -87,7 +87,7 @@ func TestLogoutVerify(t *testing.T) {
"jti": "bWJq",
"sid": "08a5019c-17e1-4977-8f42-65a12843ea02",
"nonce": "123",
"events": map[string]interface{}{
"events": map[string]any{
"http://schemas.openid.net/event/backchannel-logout": struct{}{},
},
}),
@@ -103,7 +103,7 @@ func TestLogoutVerify(t *testing.T) {
"iat": 1471566154,
"jti": "bWJq",
"sid": "08a5019c-17e1-4977-8f42-65a12843ea02",
"events": map[string]interface{}{
"events": map[string]any{
"http://blah.blah.blash/event/backchannel-logout": struct{}{},
},
}),
pkg/oidc/context.go
+3 -3
View File
@@ -9,13 +9,13 @@ type contextKey struct{}
type newSessionFlagKey struct{}
// NewContext makes a new context that contains the OpenID connect claims in a map.
func NewContext(parent context.Context, c map[string]interface{}) context.Context {
func NewContext(parent context.Context, c map[string]any) context.Context {
return context.WithValue(parent, contextKey{}, c)
}
// FromContext returns the claims map stored in a context, or nil if there isn't one.
func FromContext(ctx context.Context) map[string]interface{} {
s, _ := ctx.Value(contextKey{}).(map[string]interface{})
func FromContext(ctx context.Context) map[string]any {
s, _ := ctx.Value(contextKey{}).(map[string]any)
return s
}
pkg/service/grpc/handler/ratelimiter/ratelimiter.go
+1 -1
View File
@@ -21,7 +21,7 @@ func NewHandlerWrapper(limit int) server.HandlerWrapper {
}
return func(h server.HandlerFunc) server.HandlerFunc {
return func(ctx context.Context, req server.Request, rsp interface{}) error {
return func(ctx context.Context, req server.Request, rsp any) error {
select {
case <-ctx.Done():
return ctx.Err()
pkg/service/grpc/service.go
+1 -1
View File
@@ -99,7 +99,7 @@ func NewServiceWithClient(client client.Client, opts ...Option) (Service, error)
// micro-plugin's opentracing wrapper: `opentracing.NewHandlerWrapper()`
func LogHandler(l *log.Logger) func(fn server.HandlerFunc) server.HandlerFunc {
return func(fn server.HandlerFunc) server.HandlerFunc {
return func(ctx context.Context, req server.Request, rsp interface{}) error {
return func(ctx context.Context, req server.Request, rsp any) error {
now := time.Now()
spanContext := trace.SpanContextFromContext(ctx)
defer func() {
pkg/shared/reva.go
+2 -2
View File
@@ -22,8 +22,8 @@ func (r *Reva) GetRevaOptions() []pool.Option {
return opts
}
func (r *Reva) GetGRPCClientConfig() map[string]interface{} {
return map[string]interface{}{
func (r *Reva) GetGRPCClientConfig() map[string]any {
return map[string]any{
"tls_mode": r.TLS.Mode,
"tls_cacert": r.TLS.CACert,
}
pkg/shared/shared_types.go
+2 -2
View File
@@ -6,8 +6,8 @@ import "time"
// is to unpack environment variables into a Go value. We do so with reflection, and this data structure is just a step
// in between.
type EnvBinding struct {
EnvVars []string // name of the environment var.
Destination interface{} // pointer to the original config value to modify.
EnvVars []string // name of the environment var.
Destination any // pointer to the original config value to modify.
}
// Log defines the available logging configuration.
pkg/sync/cache.go
+4 -4
View File
@@ -17,7 +17,7 @@ type Cache struct {
// CacheEntry represents an entry on the cache. You can type assert on V.
type CacheEntry struct {
V interface{}
V any
expiration time.Time
}
@@ -25,7 +25,7 @@ type CacheEntry struct {
func NewCache(capacity int) Cache {
return Cache{
capacity: uint64(capacity),
pool: sync.Pool{New: func() interface{} {
pool: sync.Pool{New: func() any {
return new(CacheEntry)
}},
}
@@ -45,7 +45,7 @@ func (c *Cache) Load(key string) *CacheEntry {
}
// Store adds an entry for given key and value
func (c *Cache) Store(key string, val interface{}, expiration time.Time) {
func (c *Cache) Store(key string, val any, expiration time.Time) {
if c.length > c.capacity {
c.evict()
}
@@ -79,7 +79,7 @@ func (c *Cache) Delete(key string) bool {
// evict frees memory from the cache by removing entries that exceeded the cache TTL.
func (c *Cache) evict() {
c.entries.Range(func(key, mapEntry interface{}) bool {
c.entries.Range(func(key, mapEntry any) bool {
entry := mapEntry.(*CacheEntry)
if c.expired(entry) {
c.Delete(key.(string))
pkg/sync/mutex.go
+1 -1
View File
@@ -13,7 +13,7 @@ type NamedRWMutex struct {
// NewNamedRWMutex returns a new instance of NamedRWMutex.
func NewNamedRWMutex() NamedRWMutex {
return NamedRWMutex{pool: sync.Pool{New: func() interface{} {
return NamedRWMutex{pool: sync.Pool{New: func() any {
return new(sync.RWMutex)
}}}
}