dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: gofmt -w -r 'interface{} -> any' . (#2790) 

Signed-off-by: Sasha Melentyev <sasha@melentyev.io>
This commit is contained in:
Sasha Melentyev 2023-10-11 05:39:34 +03:00 committed by GitHub
parent b71cbc94cf
commit d189e18026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/config/peerhost.go
View File

@ -324,7 +324,7 @@ type DownloadOption struct {
CacheRecursiveMetadata time.Duration `mapstructure:"cacheRecursiveMetadata" yaml:"cacheRecursiveMetadata"` CacheRecursiveMetadata time.Duration `mapstructure:"cacheRecursiveMetadata" yaml:"cacheRecursiveMetadata"`
} }
type ResourceClientsOption map[string]interface{} type ResourceClientsOption map[string]any
type TransportOption struct { type TransportOption struct {
DialTimeout time.Duration `mapstructure:"dialTimeout" yaml:"dialTimeout"` DialTimeout time.Duration `mapstructure:"dialTimeout" yaml:"dialTimeout"`

2
cmd/dfget/cmd/root.go
View File

@ -249,7 +249,7 @@ func loadSourceClients(cmd *cobra.Command) error {
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
logger.Warnf("load daemon config err: %s, use default config", err) logger.Warnf("load daemon config err: %s, use default config", err)
} }
if err = source.InitSourceClients(map[string]interface{}{}); err != nil { if err = source.InitSourceClients(map[string]any{}); err != nil {
logger.Errorf("init source clients with default config err: %s", err) logger.Errorf("init source clients with default config err: %s", err)
return err return err
} }

6
pkg/rpc/interceptor.go
View File

@ -67,9 +67,9 @@ type Refresher interface {
Refresh() error Refresh() error
} }
// UnaryClientInterceptor returns a new unary client interceptor that refresh dynconfig addresses when calling error. // RefresherUnaryClientInterceptor returns a new unary client interceptor that refresh dynconfig addresses when calling error.
func RefresherUnaryClientInterceptor(r Refresher) grpc.UnaryClientInterceptor { func RefresherUnaryClientInterceptor(r Refresher) grpc.UnaryClientInterceptor {
return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error { return func(ctx context.Context, method string, req, reply any, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
err := invoker(ctx, method, req, reply, cc, opts...) err := invoker(ctx, method, req, reply, cc, opts...)
if s, ok := status.FromError(err); ok { if s, ok := status.FromError(err); ok {
if s.Code() == codes.ResourceExhausted || s.Code() == codes.Unavailable { if s.Code() == codes.ResourceExhausted || s.Code() == codes.Unavailable {
@ -82,7 +82,7 @@ func RefresherUnaryClientInterceptor(r Refresher) grpc.UnaryClientInterceptor {
} }
} }
// StreamClientInterceptor returns a new stream client interceptor that refresh dynconfig addresses when calling error. // RefresherStreamClientInterceptor returns a new stream client interceptor that refresh dynconfig addresses when calling error.
func RefresherStreamClientInterceptor(r Refresher) grpc.StreamClientInterceptor { func RefresherStreamClientInterceptor(r Refresher) grpc.StreamClientInterceptor {
return func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) { return func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
clientStream, err := streamer(ctx, desc, cc, method, opts...) clientStream, err := streamer(ctx, desc, cc, method, opts...)

8
pkg/source/clients/orasprotocol/oras_source_client.go
View File

@ -210,14 +210,14 @@ func fetchAuthInfo(host string, skipCheckExist bool) (string, error) {
return "", err return "", err
} }
var jsonData map[string]interface{} var jsonData map[string]any
if err = json.Unmarshal(databytes, &jsonData); err != nil { if err = json.Unmarshal(databytes, &jsonData); err != nil {
return "", err return "", err
} }
for _, v := range jsonData { for _, v := range jsonData {
for registry, v1 := range (v).(map[string]interface{}) { for registry, v1 := range (v).(map[string]any) {
for _, credentials := range (v1).(map[string]interface{}) { for _, credentials := range (v1).(map[string]any) {
if registry == host { if registry == host {
auth = credentials.(string) auth = credentials.(string)
} }
@ -268,7 +268,7 @@ func (client *orasSourceClient) fetchTokenWithHeader(ctx context.Context, authHe
} }
defer response.Body.Close() defer response.Body.Close()
var tokenData map[string]interface{} var tokenData map[string]any
if err = json.Unmarshal(token, &tokenData); err != nil { if err = json.Unmarshal(token, &tokenData); err != nil {
return "", err return "", err
} }

4
pkg/source/source_client_builder.go
View File

@ -27,7 +27,7 @@ import (
var ( var (
resourceClientBuilder = map[string]ResourceClientBuilder{} resourceClientBuilder = map[string]ResourceClientBuilder{}
resourceClientOptions = map[string]interface{}{} resourceClientOptions = map[string]any{}
resourceDirector = map[string]Director{} resourceDirector = map[string]Director{}
) )
@ -78,7 +78,7 @@ func UnRegisterBuilder(scheme string) {
} }
// InitSourceClients will initialize all resource clients which registered by RegisterBuilder. // InitSourceClients will initialize all resource clients which registered by RegisterBuilder.
func InitSourceClients(opts map[string]interface{}) error { func InitSourceClients(opts map[string]any) error {
// save options for resource plugin // save options for resource plugin
resourceClientOptions = opts resourceClientOptions = opts

12
scheduler/networktopology/network_topology_test.go
View File

@ -309,7 +309,7 @@ func TestNetworkTopology_FindProbedHosts(t *testing.T) {
probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID)) probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID))
} }
mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]interface{}{"6", "5", "4", "3", "2", "1"}) mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]any{"6", "5", "4", "3", "2", "1"})
}, },
expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) { expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) {
assert := assert.New(t) assert := assert.New(t)
@ -342,7 +342,7 @@ func TestNetworkTopology_FindProbedHosts(t *testing.T) {
probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID)) probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID))
} }
mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]interface{}{"1"}) mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]any{"1"})
}, },
expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) { expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) {
assert := assert.New(t) assert := assert.New(t)
@ -426,7 +426,7 @@ func TestNetworkTopology_FindProbedHosts(t *testing.T) {
probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID)) probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID))
} }
mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]interface{}{"foo", "5", "4", "3", "2", "1"}) mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]any{"foo", "5", "4", "3", "2", "1"})
}, },
expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) { expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) {
assert := assert.New(t) assert := assert.New(t)
@ -456,7 +456,7 @@ func TestNetworkTopology_FindProbedHosts(t *testing.T) {
probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID)) probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID))
} }
mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]interface{}{6, "5", "4", "3", "2", "1"}) mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]any{6, "5", "4", "3", "2", "1"})
}, },
expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) { expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) {
assert := assert.New(t) assert := assert.New(t)
@ -486,7 +486,7 @@ func TestNetworkTopology_FindProbedHosts(t *testing.T) {
probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID)) probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID))
} }
mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]interface{}{nil, "5", "4", "3", "2", "1"}) mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]any{nil, "5", "4", "3", "2", "1"})
mockRDBClient.ExpectSet(probedCountKeys[0], 0, 0).SetVal("ok") mockRDBClient.ExpectSet(probedCountKeys[0], 0, 0).SetVal("ok")
}, },
expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) { expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) {
@ -523,7 +523,7 @@ func TestNetworkTopology_FindProbedHosts(t *testing.T) {
probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID)) probedCountKeys = append(probedCountKeys, pkgredis.MakeProbedCountKeyInScheduler(host.ID))
} }
mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]interface{}{nil, "5", "4", "3", "2", "1"}) mockRDBClient.ExpectMGet(probedCountKeys...).SetVal([]any{nil, "5", "4", "3", "2", "1"})
mockRDBClient.ExpectSet(probedCountKeys[0], 0, 0).SetErr(errors.New("Initialize the probedCount value of host in redis error")) mockRDBClient.ExpectSet(probedCountKeys[0], 0, 0).SetErr(errors.New("Initialize the probedCount value of host in redis error"))
}, },
expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) { expect: func(t *testing.T, networkTopology NetworkTopology, err error, hosts []*resource.Host) {