Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
version: "2"
linters:
default: standard
enable:
- unparam

formatters:
enable:
- gofmt
- goimports
settings:
gofmt:
rewrite-rules:
- pattern: 'interface{}'
replacement: 'any'

issues:
max-same-issues: 100

exclude-files:
- generated.*\\.go

exclude-dirs:
- client
- vendor

run:
timeout: 10m
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ lint: $(BUILD_DIRS)
--env GO111MODULE=on \
--env GOFLAGS="-mod=vendor" \
$(BUILD_IMAGE) \
golangci-lint run --enable $(ADDTL_LINTERS) --timeout=30m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=client,vendor
golangci-lint run

$(BUILD_DIRS):
@mkdir -p $@
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module stash.appscode.dev/kubedump

go 1.23.0

toolchain go1.24.4
go 1.25.5

require (
github.com/spf13/cobra v1.8.0
Expand Down
43 changes: 0 additions & 43 deletions lintconf.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/manager/generic_resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (opt *itemDumper) getFileName(r unstructured.Unstructured) string {
return filepath.Join(prefix, r.GetKind(), r.GetName()) + ".yaml"
}

func storeItem(fileName string, in map[string]interface{}, storage Writer) error {
func storeItem(fileName string, in map[string]any, storage Writer) error {
data, err := yaml.Marshal(in)
if err != nil {
return err
Expand Down
6 changes: 3 additions & 3 deletions pkg/sanitizers/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ func newMetadataSanitizer() Sanitizer {
return metadataSanitizer{}
}

func (s metadataSanitizer) Sanitize(in map[string]interface{}) (map[string]interface{}, error) {
meta, ok := in["metadata"].(map[string]interface{})
func (s metadataSanitizer) Sanitize(in map[string]any) (map[string]any, error) {
meta, ok := in["metadata"].(map[string]any)
if !ok {
return in, nil
}
Expand All @@ -44,7 +44,7 @@ func (s metadataSanitizer) Sanitize(in map[string]interface{}) (map[string]inter
return in, nil
}

func cleanUpAnnotations(in interface{}) interface{} {
func cleanUpAnnotations(in any) any {
m, ok := in.(map[string]string)
if !ok {
return in
Expand Down
8 changes: 4 additions & 4 deletions pkg/sanitizers/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ func newPodSanitizer() Sanitizer {
return podSanitizer{}
}

func (s podSanitizer) Sanitize(in map[string]interface{}) (map[string]interface{}, error) {
func (s podSanitizer) Sanitize(in map[string]any) (map[string]any, error) {
ms := newMetadataSanitizer()
in, err := ms.Sanitize(in)
if err != nil {
return nil, err
}
spec, ok := in["spec"].(map[string]interface{})
spec, ok := in["spec"].(map[string]any)
if !ok {
return nil, fmt.Errorf("invalid pod spec")
}
Expand All @@ -47,7 +47,7 @@ func (s podSanitizer) Sanitize(in map[string]interface{}) (map[string]interface{
return in, nil
}

func cleanUpPodSpec(in map[string]interface{}) (map[string]interface{}, error) {
func cleanUpPodSpec(in map[string]any) (map[string]any, error) {
b, err := yaml.Marshal(in)
if err != nil {
return nil, err
Expand Down Expand Up @@ -75,7 +75,7 @@ func cleanUpPodSpec(in map[string]interface{}) (map[string]interface{}, error) {
if err != nil {
return nil, err
}
var out map[string]interface{}
var out map[string]any
err = yaml.Unmarshal(b, &out)
return out, err
}
4 changes: 2 additions & 2 deletions pkg/sanitizers/sanitizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package sanitizers

type Sanitizer interface {
Sanitize(in map[string]interface{}) (map[string]interface{}, error)
Sanitize(in map[string]any) (map[string]any, error)
}

func NewSanitizer(kind string) Sanitizer {
Expand All @@ -37,7 +37,7 @@ func newDefaultSanitizer() Sanitizer {
return defaultSanitizer{}
}

func (s defaultSanitizer) Sanitize(in map[string]interface{}) (map[string]interface{}, error) {
func (s defaultSanitizer) Sanitize(in map[string]any) (map[string]any, error) {
ms := newMetadataSanitizer()
in, err := ms.Sanitize(in)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions pkg/sanitizers/workload.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ func newWorkloadSanitizer() Sanitizer {
return workloadSanitizer{}
}

func (s workloadSanitizer) Sanitize(in map[string]interface{}) (map[string]interface{}, error) {
func (s workloadSanitizer) Sanitize(in map[string]any) (map[string]any, error) {
ms := newMetadataSanitizer()
in, err := ms.Sanitize(in)
if err != nil {
return nil, err
}

spec, ok := in["spec"].(map[string]interface{})
spec, ok := in["spec"].(map[string]any)
if !ok {
return nil, fmt.Errorf("unable to parse workload spec")
}

template, ok := spec["template"].(map[string]interface{})
template, ok := spec["template"].(map[string]any)
if !ok {
return nil, fmt.Errorf("unable to parse pod template")
}
Expand Down
Loading