From a68751a2996a710df5850d6bbe76f6afb00f5a6c Mon Sep 17 00:00:00 2001 From: Giuseppe Chiesa Date: Fri, 26 Jul 2024 15:07:12 +0200 Subject: [PATCH] fix: lint issues --- .golang-ci.yml | 2 ++ cmd/util.go | 9 --------- internal/tui/collector.go | 4 ++-- internal/tui/type.go | 2 -- pkg/skaffolder/create.go | 2 +- pkg/skaffolder/update.go | 1 - 6 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 cmd/util.go diff --git a/.golang-ci.yml b/.golang-ci.yml index 6d839fe..0b97e19 100644 --- a/.golang-ci.yml +++ b/.golang-ci.yml @@ -46,6 +46,8 @@ linters-settings: - singleCaseSwitch - hugeParam - appendCombine + - sloppyReassign + - whyNoLint funlen: lines: 100 statements: 52 diff --git a/cmd/util.go b/cmd/util.go deleted file mode 100644 index df31d06..0000000 --- a/cmd/util.go +++ /dev/null @@ -1,9 +0,0 @@ -package cmd - -func mapStringToMapInterface(m map[string]string) map[string]interface{} { - res := make(map[string]interface{}) - for k, v := range m { - res[k] = v - } - return res -} diff --git a/internal/tui/collector.go b/internal/tui/collector.go index dcf6959..ccc944b 100644 --- a/internal/tui/collector.go +++ b/internal/tui/collector.go @@ -34,7 +34,7 @@ func (m *Model) Init() tea.Cmd { } func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { - var cmds []tea.Cmd = make([]tea.Cmd, len(m.inputs)) + var cmds = make([]tea.Cmd, len(m.inputs)) for i := range m.inputs { m.inputs[i], cmds[i] = m.inputs[i].Update(msg) @@ -84,7 +84,7 @@ func (m *Model) View() string { builder.WriteRune('\n') builder.WriteString(helpStyle.Render(" ↑, ↓: navigate, enter: confirm, ctrl+c: quit, ctrl+s: save")) if m.err != nil { - builder.WriteString(errorStyle.Render(fmt.Sprintf("%s", m.err.Error()))) + builder.WriteString(errorStyle.Render(m.err.Error())) } return builder.String() } diff --git a/internal/tui/type.go b/internal/tui/type.go index 1ca745b..68e41aa 100644 --- a/internal/tui/type.go +++ b/internal/tui/type.go @@ -1,7 +1,6 @@ package tui import ( - "github.com/charmbracelet/bubbles/cursor" "github.com/charmbracelet/bubbles/textinput" ) @@ -9,7 +8,6 @@ type Model struct { header string focusIndex int inputs []textinput.Model - cursorMode cursor.Mode err error exitWithCtrlC bool } diff --git a/pkg/skaffolder/create.go b/pkg/skaffolder/create.go index 27de9c0..391d14f 100644 --- a/pkg/skaffolder/create.go +++ b/pkg/skaffolder/create.go @@ -16,7 +16,7 @@ type SkaCreate struct { Log *log.Entry } -func NewSkaCreate(templateURI string, destinationPath string, variables map[string]string) *SkaCreate { +func NewSkaCreate(templateURI, destinationPath string, variables map[string]string) *SkaCreate { logCtx := log.WithFields(log.Fields{ "pkg": "skaffolder", }) diff --git a/pkg/skaffolder/update.go b/pkg/skaffolder/update.go index 440cdc3..bff0959 100644 --- a/pkg/skaffolder/update.go +++ b/pkg/skaffolder/update.go @@ -69,7 +69,6 @@ func (s *SkaUpdate) Update() error { // check if interactive mode is required if interactiveService.ShouldRun() { - // overrides the variables from remote service with already saved variables interactiveService.SetDefaults(mapInterfaceToString(vars))