♻️ interface{} -> any (#1261)

MatiasFrank · web-flow · commit d4af08fa7fd4 · 2024-10-04T09:45:34.000+02:00
diff --git a/cmd/rig-ops/cmd/base/register.go b/cmd/rig-ops/cmd/base/register.go
@@ -25,7 +25,7 @@ import (
 
 var options []fx.Option
 
-func Register(f interface{}) func(cmd *cobra.Command, args []string) error {
+func Register(f any) func(cmd *cobra.Command, args []string) error {
 	options = append(options,
 		fx.Provide(f),
 	)
diff --git a/cmd/rig/cmd/capsule/jobs/add.go b/cmd/rig/cmd/capsule/jobs/add.go
@@ -82,7 +82,7 @@ func (c *Cmd) cronJobFromPath(path string) (*capsule.CronJob, error) {
 		return nil, err
 	}
 
-	var raw interface{}
+	var raw any
 	if err := yaml.Unmarshal(bytes, &raw); err != nil {
 		return nil, err
 	}
diff --git a/cmd/rig/cmd/capsule/root/status_utils.go b/cmd/rig/cmd/capsule/root/status_utils.go
@@ -226,7 +226,7 @@ type getInfoStep interface {
 	GetInfo() *rollout.StepInfo
 }
 
-func GetStepInfo(s interface{}) *rollout.StepInfo {
+func GetStepInfo(s any) *rollout.StepInfo {
 	msg, ok := s.(protoreflect.ProtoMessage)
 	if !ok {
 		return nil
diff --git a/cmd/rig/cmd/capsule/scale/horizontal.go b/cmd/rig/cmd/capsule/scale/horizontal.go
@@ -92,7 +92,7 @@ func (c *Cmd) autoscale(ctx context.Context, cmd *cobra.Command, _ []string) err
 			return err
 		}
 
-		var raw interface{}
+		var raw any
 		if err := yaml.Unmarshal(bytes, &raw); err != nil {
 			return err
 		}
diff --git a/pkg/cli/module.go b/pkg/cli/module.go
@@ -87,7 +87,7 @@ var Module = fx.Module(
 	fx.Provide(func() common.Prompter { return common.StandardPrompter{} }),
 )
 
-type ContextDependency interface{}
+type ContextDependency any
 
 type contextParams struct {
 	fx.In
diff --git a/pkg/controller/plugin/external_plugin.go b/pkg/controller/plugin/external_plugin.go
@@ -90,7 +90,7 @@ type loggerSink struct {
 	logger logr.Logger
 }
 
-func (l *loggerSink) Accept(name string, level hclog.Level, msg string, args ...interface{}) {
+func (l *loggerSink) Accept(name string, level hclog.Level, msg string, args ...any) {
 	logger := l.logger.WithName(name).WithValues(args...)
 	if level < hclog.Info {
 		return
diff --git a/pkg/controller/plugin/heap.go b/pkg/controller/plugin/heap.go
@@ -105,14 +105,14 @@ func (s *sliceHeap[E]) Less(i, j int) bool {
 	return s.less(s.s[i], s.s[j])
 }
 
-func (s *sliceHeap[E]) Push(x interface{}) {
+func (s *sliceHeap[E]) Push(x any) {
 	s.s = append(s.s, x.(E))
 	if s.setIndex != nil {
 		s.setIndex(s.s[len(s.s)-1], len(s.s)-1)
 	}
 }
 
-func (s *sliceHeap[E]) Pop() interface{} {
+func (s *sliceHeap[E]) Pop() any {
 	e := s.s[len(s.s)-1]
 	if s.setIndex != nil {
 		s.setIndex(e, -1)
diff --git a/pkg/controller/plugin/helpers.go b/pkg/controller/plugin/helpers.go
@@ -36,7 +36,7 @@ func ParseTemplatedConfig[T any](data []byte, req pipeline.CapsuleRequest, steps
 		}
 
 		for k, v := range m {
-			result := map[string]interface{}{}
+			result := map[string]any{}
 			d, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{TagName: "json", Result: &result})
 			if err != nil {
 				return empty, err
diff --git a/pkg/controller/plugin/watcher.go b/pkg/controller/plugin/watcher.go
@@ -535,7 +535,7 @@ func (ow *objectWatcher) Watch(options metav1.ListOptions) (watch.Interface, err
 	return wi, err
 }
 
-func (ow *objectWatcher) OnAdd(obj interface{}, _ bool) {
+func (ow *objectWatcher) OnAdd(obj any, _ bool) {
 	if e, ok := obj.(*corev1.Event); ok {
 		key := cache.NewObjectName(e.InvolvedObject.Namespace, e.InvolvedObject.Name)
 		item, exists, err := ow.store.GetByKey(key.String())
@@ -596,11 +596,11 @@ func (ow *objectWatcher) OnAdd(obj interface{}, _ bool) {
 	}
 }
 
-func (ow *objectWatcher) OnUpdate(_, newObj interface{}) {
+func (ow *objectWatcher) OnUpdate(_, newObj any) {
 	ow.OnAdd(newObj, false)
 }
 
-func (ow *objectWatcher) OnDelete(obj interface{}) {
+func (ow *objectWatcher) OnDelete(obj any) {
 	if e, ok := obj.(*corev1.Event); ok {
 		key := cache.NewObjectName(e.InvolvedObject.Namespace, e.InvolvedObject.Name)
 		item, exists, err := ow.store.GetByKey(key.String())
diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go
@@ -258,7 +258,7 @@ func IsUnauthenticated(err error) bool {
 //
 // The gRPC framework will generate this error code when cancellation
 // is requested.
-func CanceledErrorf(format string, a ...interface{}) error {
+func CanceledErrorf(format string, a ...any) error {
 	return NewError(connect.CodeCanceled, fmt.Errorf(format, a...))
 }
 
@@ -270,7 +270,7 @@ func CanceledErrorf(format string, a ...interface{}) error {
 //
 // The gRPC framework will generate this error code in the above two
 // mentioned cases.
-func UnknownErrorf(format string, a ...interface{}) error {
+func UnknownErrorf(format string, a ...any) error {
 	return NewError(connect.CodeUnknown, fmt.Errorf(format, a...))
 }
 
@@ -280,7 +280,7 @@ func UnknownErrorf(format string, a ...interface{}) error {
 // (e.g., a malformed file name).
 //
 // This error code will not be generated by the gRPC framework.
-func InvalidArgumentErrorf(format string, a ...interface{}) error {
+func InvalidArgumentErrorf(format string, a ...any) error {
 	return NewError(connect.CodeInvalidArgument, fmt.Errorf(format, a...))
 }
 
@@ -292,23 +292,23 @@ func InvalidArgumentErrorf(format string, a ...interface{}) error {
 //
 // The gRPC framework will generate this error code when the deadline is
 // exceeded.
-func DeadlineExceededErrorf(format string, a ...interface{}) error {
+func DeadlineExceededErrorf(format string, a ...any) error {
 	return NewError(connect.CodeDeadlineExceeded, fmt.Errorf(format, a...))
 }
 
 // NotFoundErrorf creates a new error that means some requested entity (e.g., file or directory) was
 // not found.
 //
 // This error code will not be generated by the gRPC framework.
-func NotFoundErrorf(format string, a ...interface{}) error {
+func NotFoundErrorf(format string, a ...any) error {
 	return NewError(connect.CodeNotFound, fmt.Errorf(format, a...))
 }
 
 // AlreadyExistsErrorf creates a new error that means an attempt to create an entity failed because one
 // already exists.
 //
 // This error code will not be generated by the gRPC framework.
-func AlreadyExistsErrorf(format string, a ...interface{}) error {
+func AlreadyExistsErrorf(format string, a ...any) error {
 	return NewError(connect.CodeAlreadyExists, fmt.Errorf(format, a...))
 }
 
@@ -321,7 +321,7 @@ func AlreadyExistsErrorf(format string, a ...interface{}) error {
 //
 // This error code will not be generated by the gRPC core framework,
 // but expect authentication middleware to use it.
-func PermissionDeniedErrorf(format string, a ...interface{}) error {
+func PermissionDeniedErrorf(format string, a ...any) error {
 	return NewError(connect.CodePermissionDenied, fmt.Errorf(format, a...))
 }
 
@@ -331,7 +331,7 @@ func PermissionDeniedErrorf(format string, a ...interface{}) error {
 // This error code will be generated by the gRPC framework in
 // out-of-memory and server overload situations, or when a message is
 // larger than the configured maximum size.
-func ResourceExhaustedErrorf(format string, a ...interface{}) error {
+func ResourceExhaustedErrorf(format string, a ...any) error {
 	return NewError(connect.CodeResourceExhausted, fmt.Errorf(format, a...))
 }
 
@@ -357,7 +357,7 @@ func ResourceExhaustedErrorf(format string, a ...interface{}) error {
 //	    read-modify-write on the same resource.
 //
 // This error code will not be generated by the gRPC framework.
-func FailedPreconditionErrorf(format string, a ...interface{}) error {
+func FailedPreconditionErrorf(format string, a ...any) error {
 	return NewError(connect.CodeFailedPrecondition, fmt.Errorf(format, a...))
 }
 
@@ -369,7 +369,7 @@ func FailedPreconditionErrorf(format string, a ...interface{}) error {
 // Aborted, and Unavailable.
 //
 // This error code will not be generated by the gRPC framework.
-func AbortedErrorf(format string, a ...interface{}) error {
+func AbortedErrorf(format string, a ...any) error {
 	return NewError(connect.CodeAborted, fmt.Errorf(format, a...))
 }
 
@@ -390,7 +390,7 @@ func AbortedErrorf(format string, a ...interface{}) error {
 // they are done.
 //
 // This error code will not be generated by the gRPC framework.
-func OutOfRangeErrorf(format string, a ...interface{}) error {
+func OutOfRangeErrorf(format string, a ...any) error {
 	return NewError(connect.CodeOutOfRange, fmt.Errorf(format, a...))
 }
 
@@ -402,7 +402,7 @@ func OutOfRangeErrorf(format string, a ...interface{}) error {
 // is missing on the server. It can also be generated for unknown
 // compression algorithms or a disagreement as to whether an RPC should
 // be streaming.
-func UnimplementedErrorf(format string, a ...interface{}) error {
+func UnimplementedErrorf(format string, a ...any) error {
 	return NewError(connect.CodeUnimplemented, fmt.Errorf(format, a...))
 }
 
@@ -412,7 +412,7 @@ func UnimplementedErrorf(format string, a ...interface{}) error {
 //
 // This error code will be generated by the gRPC framework in several
 // internal error conditions.
-func InternalErrorf(format string, a ...interface{}) error {
+func InternalErrorf(format string, a ...any) error {
 	return NewError(connect.CodeInternal, fmt.Errorf(format, a...))
 }
 
@@ -426,14 +426,14 @@ func InternalErrorf(format string, a ...interface{}) error {
 //
 // This error code will be generated by the gRPC framework during
 // abrupt shutdown of a server process or network connection.
-func UnavailableErrorf(format string, a ...interface{}) error {
+func UnavailableErrorf(format string, a ...any) error {
 	return NewError(connect.CodeUnavailable, fmt.Errorf(format, a...))
 }
 
 // DataLossErrorf creates a new error that indicates unrecoverable data loss or corruption.
 //
 // This error code will not be generated by the gRPC framework.
-func DataLossErrorf(format string, a ...interface{}) error {
+func DataLossErrorf(format string, a ...any) error {
 	return NewError(connect.CodeDataLoss, fmt.Errorf(format, a...))
 }
 
@@ -443,7 +443,7 @@ func DataLossErrorf(format string, a ...interface{}) error {
 // The gRPC framework will generate this error code when the
 // authentication metadata is invalid or a Credentials callback fails,
 // but also expect authentication middleware to generate it.
-func UnauthenticatedErrorf(format string, a ...interface{}) error {
+func UnauthenticatedErrorf(format string, a ...any) error {
 	return NewError(connect.CodeUnauthenticated, fmt.Errorf(format, a...))
 }
 
diff --git a/pkg/pipeline/pipeline.go b/pkg/pipeline/pipeline.go
@@ -44,7 +44,7 @@ func (ok ObjectKey) String() string {
 	return fmt.Sprintf("%s/%s", ok.GroupVersionKind.String(), ok.ObjectKey.String())
 }
 
-func (ok ObjectKey) MarshalLog() interface{} {
+func (ok ObjectKey) MarshalLog() any {
 	return struct {
 		Group     string `json:"group,omitempty"`
 		Version   string `json:"version,omitempty"`
diff --git a/pkg/roclient/layered_reader.go b/pkg/roclient/layered_reader.go
@@ -75,7 +75,7 @@ func (r *LayeredReader) List(ctx context.Context, list client.ObjectList, opts .
 		}
 	}
 
-	bs, err := gojson.Marshal(map[string]interface{}{
+	bs, err := gojson.Marshal(map[string]any{
 		"items": objs,
 	})
 	if err != nil {
diff --git a/pkg/roclient/reader.go b/pkg/roclient/reader.go
@@ -125,7 +125,7 @@ func (r *reader) List(_ context.Context, list client.ObjectList, opts ...client.
 		}
 	}
 
-	bs, err := gojson.Marshal(map[string]interface{}{
+	bs, err := gojson.Marshal(map[string]any{
 		"items": objs,
 	})
 	if err != nil {
diff --git a/pkg/uuid/uuid.go b/pkg/uuid/uuid.go
@@ -71,7 +71,7 @@ func (u *UUID) UnmarshalJSON(bs []byte) error {
 	return nil
 }
 
-func (u UUID) MarshalYAML() (interface{}, error) {
+func (u UUID) MarshalYAML() (any, error) {
 	if u == Nil {
 		return "", nil
 	}
@@ -105,7 +105,7 @@ func (u *UUID) Unmarshal(v *yaml.Node) error {
 }
 
 func MapstructureDecodeFunc() mapstructure.DecodeHookFuncType {
-	return func(f reflect.Type, t reflect.Type, data interface{}) (interface{}, error) {
+	return func(f reflect.Type, t reflect.Type, data any) (any, error) {
 		if f == reflect.TypeOf("") && t == reflect.TypeOf(Nil) {
 			s := data.(string)
 
diff --git a/plugins/builtin/object_create/plugin_test.go b/plugins/builtin/object_create/plugin_test.go
@@ -124,7 +124,7 @@ object: |
 			}
 			require.NoError(t, plugin.Run(context.Background(), req, hclog.Default()))
 			vpa := &unstructured.Unstructured{
-				Object: map[string]interface{}{
+				Object: map[string]any{
 					"apiVersion": "vpcresources.k8s.aws/v1beta1",
 					"kind":       "SecurityGroupPolicy",
 					"metadata": map[string]any{

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`var options []fx.Option`
`27`	`27`
`28`		`-func Register(f interface{}) func(cmd *cobra.Command, args []string) error {`
	`28`	`+func Register(f any) func(cmd *cobra.Command, args []string) error {`
`29`	`29`	`options = append(options,`
`30`	`30`	`fx.Provide(f),`
`31`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func (c Cmd) cronJobFromPath(path string) (capsule.CronJob, error) {`
`82`	`82`	`return nil, err`
`83`	`83`	`}`
`84`	`84`
`85`		`- var raw interface{}`
	`85`	`+ var raw any`
`86`	`86`	`if err := yaml.Unmarshal(bytes, &raw); err != nil {`
`87`	`87`	`return nil, err`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ type getInfoStep interface {`
`226`	`226`	`GetInfo() *rollout.StepInfo`
`227`	`227`	`}`
`228`	`228`
`229`		`-func GetStepInfo(s interface{}) *rollout.StepInfo {`
	`229`	`+func GetStepInfo(s any) *rollout.StepInfo {`
`230`	`230`	`msg, ok := s.(protoreflect.ProtoMessage)`
`231`	`231`	`if !ok {`
`232`	`232`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (c Cmd) autoscale(ctx context.Context, cmd cobra.Command, _ []string) err`
`92`	`92`	`return err`
`93`	`93`	`}`
`94`	`94`
`95`		`- var raw interface{}`
	`95`	`+ var raw any`
`96`	`96`	`if err := yaml.Unmarshal(bytes, &raw); err != nil {`
`97`	`97`	`return err`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ var Module = fx.Module(`
`87`	`87`	`fx.Provide(func() common.Prompter { return common.StandardPrompter{} }),`
`88`	`88`	`)`
`89`	`89`
`90`		`-type ContextDependency interface{}`
	`90`	`+type ContextDependency any`
`91`	`91`
`92`	`92`	`type contextParams struct {`
`93`	`93`	`fx.In`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ type loggerSink struct {`
`90`	`90`	`logger logr.Logger`
`91`	`91`	`}`
`92`	`92`
`93`		`-func (l *loggerSink) Accept(name string, level hclog.Level, msg string, args ...interface{}) {`
	`93`	`+func (l *loggerSink) Accept(name string, level hclog.Level, msg string, args ...any) {`
`94`	`94`	`logger := l.logger.WithName(name).WithValues(args...)`
`95`	`95`	`if level < hclog.Info {`
`96`	`96`	`return`
Original file line number	Diff line number	Diff line change
`@@ -105,14 +105,14 @@ func (s *sliceHeap[E]) Less(i, j int) bool {`
`105`	`105`	`return s.less(s.s[i], s.s[j])`
`106`	`106`	`}`
`107`	`107`
`108`		`-func (s *sliceHeap[E]) Push(x interface{}) {`
	`108`	`+func (s *sliceHeap[E]) Push(x any) {`
`109`	`109`	`s.s = append(s.s, x.(E))`
`110`	`110`	`if s.setIndex != nil {`
`111`	`111`	`s.setIndex(s.s[len(s.s)-1], len(s.s)-1)`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`-func (s *sliceHeap[E]) Pop() interface{} {`
	`115`	`+func (s *sliceHeap[E]) Pop() any {`
`116`	`116`	`e := s.s[len(s.s)-1]`
`117`	`117`	`if s.setIndex != nil {`
`118`	`118`	`s.setIndex(e, -1)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func ParseTemplatedConfig[T any](data []byte, req pipeline.CapsuleRequest, steps`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`for k, v := range m {`
`39`		`- result := map[string]interface{}{}`
	`39`	`+ result := map[string]any{}`
`40`	`40`	`d, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{TagName: "json", Result: &result})`
`41`	`41`	`if err != nil {`
`42`	`42`	`return empty, err`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ func (ow *objectWatcher) Watch(options metav1.ListOptions) (watch.Interface, err`
`535`	`535`	`return wi, err`
`536`	`536`	`}`
`537`	`537`
`538`		`-func (ow *objectWatcher) OnAdd(obj interface{}, _ bool) {`
	`538`	`+func (ow *objectWatcher) OnAdd(obj any, _ bool) {`
`539`	`539`	`if e, ok := obj.(*corev1.Event); ok {`
`540`	`540`	`key := cache.NewObjectName(e.InvolvedObject.Namespace, e.InvolvedObject.Name)`
`541`	`541`	`item, exists, err := ow.store.GetByKey(key.String())`
`@@ -596,11 +596,11 @@ func (ow *objectWatcher) OnAdd(obj interface{}, _ bool) {`
`596`	`596`	`}`
`597`	`597`	`}`
`598`	`598`
`599`		`-func (ow *objectWatcher) OnUpdate(_, newObj interface{}) {`
	`599`	`+func (ow *objectWatcher) OnUpdate(_, newObj any) {`
`600`	`600`	`ow.OnAdd(newObj, false)`
`601`	`601`	`}`
`602`	`602`
`603`		`-func (ow *objectWatcher) OnDelete(obj interface{}) {`
	`603`	`+func (ow *objectWatcher) OnDelete(obj any) {`
`604`	`604`	`if e, ok := obj.(*corev1.Event); ok {`
`605`	`605`	`key := cache.NewObjectName(e.InvolvedObject.Namespace, e.InvolvedObject.Name)`
`606`	`606`	`item, exists, err := ow.store.GetByKey(key.String())`