Skip to content

Commit 8575496

Browse files
PascalBourdierPascalBourdier
authored
refactor: follow go fix advice about any (#7052)
I only launch the following command: ``` go fix -any ./... ``` Signed-off-by: Pascal Bourdier <pascal.bourdier@gmail.com>
1 parent a63e383 commit 8575496

28 files changed

Lines changed: 186 additions & 186 deletions

File tree

‎internal/bindata/olm/manifests.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/cmd/operator-sdk/alpha/config3alphato3/convert_config_3-alpha_to_3.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type templObj struct {
4242
// convertConfig3AlphaTo3 returns cfgBytes converted to 3 iff cfgBytes is version 3-alpha.
4343
func convertConfig3AlphaTo3(cfgBytes []byte) (_ []byte, err error) {
4444
tObj := templObj{}
45-
cfgObj := make(map[string]interface{}, 5)
45+
cfgObj := make(map[string]any, 5)
4646
if err := yaml.Unmarshal(cfgBytes, &cfgObj); err != nil {
4747
return nil, err
4848
}
@@ -72,13 +72,13 @@ func convertConfig3AlphaTo3(cfgBytes []byte) (_ []byte, err error) {
7272
domain = domainObj.(string)
7373
}
7474

75-
resObjs := obj.([]interface{})
75+
resObjs := obj.([]any)
7676
resources := make([]resource.Resource, len(resObjs))
7777

7878
for i, resObj := range resObjs {
7979
resources[i].Domain = domain
8080

81-
res := resObj.(map[string]interface{})
81+
res := resObj.(map[string]any)
8282
if groupObj, ok := res["group"]; ok {
8383
resources[i].Group = groupObj.(string)
8484
}

‎internal/cmd/operator-sdk/generate/bundle/cmd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (c *bundleCmd) addFlagsTo(fs *pflag.FlagSet) {
146146
fs.BoolVar(&c.useImageDigests, "use-image-digests", false, "Use SHA Digest for images")
147147
}
148148

149-
func (c bundleCmd) println(a ...interface{}) {
149+
func (c bundleCmd) println(a ...any) {
150150
if !c.quiet && !c.stdout {
151151
fmt.Println(a...)
152152
}

‎internal/cmd/operator-sdk/generate/internal/genutil.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func makeObjectFileName(obj client.Object) string {
118118
}
119119

120120
// writeObjectToFile marshals crd to bytes and writes them to dir in file.
121-
func writeObjectToFile(dir string, obj interface{}, fileName string) error {
121+
func writeObjectToFile(dir string, obj any, fileName string) error {
122122
f, err := os.Create(filepath.Join(dir, fileName))
123123
if err != nil {
124124
return err
@@ -128,7 +128,7 @@ func writeObjectToFile(dir string, obj interface{}, fileName string) error {
128128
}
129129

130130
// writeObject marshals crd to bytes and writes them to w.
131-
func writeObject(w io.Writer, obj interface{}) error {
131+
func writeObject(w io.Writer, obj any) error {
132132
b, err := yaml.Marshal(obj)
133133
if err != nil {
134134
return err

‎internal/cmd/operator-sdk/generate/packagemanifests/cmd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (c *packagemanifestsCmd) addFlagsTo(fs *pflag.FlagSet) {
111111
fs.StringVar(&c.packageName, "package", "", "Package name")
112112
}
113113

114-
func (c packagemanifestsCmd) println(a ...interface{}) {
114+
func (c packagemanifestsCmd) println(a ...any) {
115115
if !c.quiet && !c.stdout {
116116
fmt.Println(a...)
117117
}

‎internal/cmd/operator-sdk/scorecard/xunit/xunit.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ type TestSuites struct {
3636

3737
// Preperty is a named property that will be formatted as an XML tag.
3838
type Property struct {
39-
Name string `xml:"name,attr"`
40-
Value interface{} `xml:"value,attr"`
39+
Name string `xml:"name,attr"`
40+
Value any `xml:"value,attr"`
4141
}
4242

4343
// TestSuite contains for details about a test beyond the final status

‎internal/generate/clusterserviceversion/bases/definitions/crd.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (g generator) buildCRDDescriptionFromType(gvk schema.GroupVersionKind, type
117117
return description, descriptionOrder, nil
118118
}
119119

120-
func (g generator) getTypedDescriptors(pkg *loader.Package, kindType *markers.TypeInfo, t reflect.Type, descType string) ([]interface{}, error) {
120+
func (g generator) getTypedDescriptors(pkg *loader.Package, kindType *markers.TypeInfo, t reflect.Type, descType string) ([]any, error) {
121121
// Find child in the kind type.
122122
child, err := findChildForDescType(kindType, descType)
123123
if err != nil {
@@ -133,7 +133,7 @@ func (g generator) getTypedDescriptors(pkg *loader.Package, kindType *markers.Ty
133133
return getTypedDescriptors(markedFields, t, descType), nil
134134
}
135135

136-
func getTypedDescriptors(markedFields map[crd.TypeIdent][]*fieldInfo, t reflect.Type, descType string) (descriptors []interface{}) {
136+
func getTypedDescriptors(markedFields map[crd.TypeIdent][]*fieldInfo, t reflect.Type, descType string) (descriptors []any) {
137137
descriptorBuckets := make(map[int][]reflect.Value)
138138
orders := make([]int, 0)
139139
for _, fields := range markedFields {

‎internal/generate/clusterserviceversion/bases/definitions/crd_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
var _ = Describe("getTypedDescriptors", func() {
3535
var (
3636
markedFields map[crd.TypeIdent][]*fieldInfo
37-
out []interface{}
37+
out []any
3838
)
3939

4040
BeforeEach(func() {
@@ -50,7 +50,7 @@ var _ = Describe("getTypedDescriptors", func() {
5050
{
5151
FieldInfo: markers.FieldInfo{
5252
Markers: markers.MarkerValues{
53-
"": []interface{}{
53+
"": []any{
5454
Descriptor{"spec", "Foo", []string{"urn:alm:descriptor:com.tectonic.ui:text"}, nil},
5555
},
5656
},
@@ -59,7 +59,7 @@ var _ = Describe("getTypedDescriptors", func() {
5959
}
6060
out = getTypedDescriptors(markedFields, reflect.TypeOf(v1alpha1.SpecDescriptor{}), spec)
6161
Expect(out).To(HaveLen(1))
62-
Expect(out).To(BeEquivalentTo([]interface{}{
62+
Expect(out).To(BeEquivalentTo([]any{
6363
v1alpha1.SpecDescriptor{
6464
DisplayName: "Foo",
6565
XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:text"},
@@ -71,7 +71,7 @@ var _ = Describe("getTypedDescriptors", func() {
7171
{
7272
FieldInfo: markers.FieldInfo{
7373
Markers: markers.MarkerValues{
74-
"": []interface{}{
74+
"": []any{
7575
Descriptor{"status", "Foo", []string{"urn:alm:descriptor:com.tectonic.ui:text"}, nil},
7676
},
7777
},
@@ -86,7 +86,7 @@ var _ = Describe("getTypedDescriptors", func() {
8686
{
8787
FieldInfo: markers.FieldInfo{
8888
Markers: markers.MarkerValues{
89-
"": []interface{}{
89+
"": []any{
9090
Descriptor{"status", "Foo", []string{"urn:alm:descriptor:com.tectonic.ui:text"}, nil},
9191
},
9292
},
@@ -95,7 +95,7 @@ var _ = Describe("getTypedDescriptors", func() {
9595
}
9696
out = getTypedDescriptors(markedFields, reflect.TypeOf(v1alpha1.StatusDescriptor{}), status)
9797
Expect(out).To(HaveLen(1))
98-
Expect(out).To(BeEquivalentTo([]interface{}{
98+
Expect(out).To(BeEquivalentTo([]any{
9999
v1alpha1.StatusDescriptor{
100100
DisplayName: "Foo",
101101
XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:text"},
@@ -107,7 +107,7 @@ var _ = Describe("getTypedDescriptors", func() {
107107
{
108108
FieldInfo: markers.FieldInfo{
109109
Markers: markers.MarkerValues{
110-
"": []interface{}{
110+
"": []any{
111111
Descriptor{"spec", "Foo", nil, nil},
112112
Descriptor{"spec", "", nil, intPtr(2)},
113113
Descriptor{"spec", "", []string{"urn:alm:descriptor:com.tectonic.ui:text"}, nil},
@@ -120,7 +120,7 @@ var _ = Describe("getTypedDescriptors", func() {
120120
}
121121
out = getTypedDescriptors(markedFields, reflect.TypeOf(v1alpha1.SpecDescriptor{}), spec)
122122
Expect(out).To(HaveLen(1))
123-
Expect(out).To(BeEquivalentTo([]interface{}{
123+
Expect(out).To(BeEquivalentTo([]any{
124124
v1alpha1.SpecDescriptor{
125125
DisplayName: "Foo",
126126
XDescriptors: []string{"urn:alm:descriptor:com.tectonic.ui:text"},
@@ -133,23 +133,23 @@ var _ = Describe("getTypedDescriptors", func() {
133133
{
134134
FieldInfo: markers.FieldInfo{
135135
Markers: markers.MarkerValues{
136-
"": []interface{}{Descriptor{"spec", "Foo", nil, intPtr(1)}},
136+
"": []any{Descriptor{"spec", "Foo", nil, intPtr(1)}},
137137
},
138138
},
139139
pathSegments: []string{"foo"},
140140
},
141141
{
142142
FieldInfo: markers.FieldInfo{
143143
Markers: markers.MarkerValues{
144-
"": []interface{}{Descriptor{"spec", "Bar", nil, intPtr(0)}},
144+
"": []any{Descriptor{"spec", "Bar", nil, intPtr(0)}},
145145
},
146146
},
147147
pathSegments: []string{"bar"},
148148
},
149149
}
150150
out = getTypedDescriptors(markedFields, reflect.TypeOf(v1alpha1.SpecDescriptor{}), spec)
151151
Expect(out).To(HaveLen(2))
152-
Expect(out).To(BeEquivalentTo([]interface{}{
152+
Expect(out).To(BeEquivalentTo([]any{
153153
v1alpha1.SpecDescriptor{DisplayName: "Bar", Path: "bar"},
154154
v1alpha1.SpecDescriptor{DisplayName: "Foo", Path: "foo"},
155155
}))
@@ -166,7 +166,7 @@ func intPtr(i int) *int { return &i }
166166

167167
// makeMockMarkedFields returns a randomly generated mock marked field set,
168168
// and the expected sorted set of descriptors.
169-
func makeMockMarkedFields() (markedFields map[crd.TypeIdent][]*fieldInfo, expected []interface{}) {
169+
func makeMockMarkedFields() (markedFields map[crd.TypeIdent][]*fieldInfo, expected []any) {
170170
descBuckets := make(map[int][]v1alpha1.SpecDescriptor, 100)
171171
r := rand.New(rand.NewSource(time.Now().UnixNano()))
172172
markedFields = make(map[crd.TypeIdent][]*fieldInfo, 100)
@@ -186,7 +186,7 @@ func makeMockMarkedFields() (markedFields map[crd.TypeIdent][]*fieldInfo, expect
186186
{
187187
FieldInfo: markers.FieldInfo{
188188
Markers: markers.MarkerValues{
189-
"": []interface{}{Descriptor{"spec", name, nil, intPtr(order)}},
189+
"": []any{Descriptor{"spec", name, nil, intPtr(order)}},
190190
},
191191
},
192192
pathSegments: []string{s},

‎internal/generate/internal/genutil.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func Open(dir, fileName string) (*File, error) {
5757
}
5858

5959
// WriteObject writes a k8s object to w.
60-
func WriteObject(w io.Writer, obj interface{}) error {
60+
func WriteObject(w io.Writer, obj any) error {
6161
b, err := k8sutil.GetObjectBytes(obj, yaml.Marshal)
6262
if err != nil {
6363
return err
@@ -71,7 +71,7 @@ func WriteObject(w io.Writer, obj interface{}) error {
7171
}
7272

7373
// WriteObject writes any object to w.
74-
func WriteYAML(w io.Writer, obj interface{}) error {
74+
func WriteYAML(w io.Writer, obj any) error {
7575
b, err := yaml.Marshal(obj)
7676
if err != nil {
7777
return err

‎internal/helm/client/actionconfig.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type ActionConfigGetter interface {
4343
func NewActionConfigGetter(cfg *rest.Config, rm meta.RESTMapper, log logr.Logger) (ActionConfigGetter, error) {
4444
rcg := newRESTClientGetter(cfg, rm, "")
4545
// Setup the debug log function that Helm will use
46-
debugLog := func(format string, v ...interface{}) {
46+
debugLog := func(format string, v ...any) {
4747
if log.Enabled() {
4848
log.V(1).Info(fmt.Sprintf(format, v...))
4949
}
@@ -72,7 +72,7 @@ var _ ActionConfigGetter = &actionConfigGetter{}
7272
type actionConfigGetter struct {
7373
kubeClient *kube.Client
7474
kubeClientSet kubernetes.Interface
75-
debugLog func(string, ...interface{})
75+
debugLog func(string, ...any)
7676
restClientGetter *restClientGetter
7777
watchedSecrets map[string]*WatchedSecrets
7878
watchedSecretsMutex *sync.Mutex

0 commit comments

Comments
 (0)