Merge pull request #453 from navidys/golangci_lint

golangci-lint update 1.56.2

.golangci.yml

@@ -12,6 +12,7 @@ linters:
     - wrapcheck
     - execinquery
     - funlen
+    - depguard
     # generics disabled
     - wastedassign
     - rowserrcheck

Makefile

@@ -88,7 +88,7 @@ install.tools: .install.ginkgo .install.bats .install.pre-commit .install.codesp
 
 .PHONY: .install.golangci-lint
 .install.golangci-lint:
-	VERSION=1.51.1 ./hack/install_golangci.sh
+	VERSION=1.56.2 ./hack/install_golangci.sh
 
 .PHONY: .install.codespell
 .install.codespell:

cmd/root.go

@@ -29,7 +29,7 @@ func Execute() {
 	cobra.CheckErr(rootCmd.Execute())
 }
 
-func run(cmd *cobra.Command, args []string) error { //nolint:cyclop
+func run(cmd *cobra.Command, args []string) error { //nolint:cyclop,revive
 	var (
 		logOutput = io.Discard
 		runLog    = fmt.Sprintf("starting %s version %s", appName, appVersion)

cmd/version.go

@@ -15,7 +15,7 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: fmt.Sprintf("Display %s version and exit.\n", appName),
 	Long:  fmt.Sprintf("Display %s version and exit.\n", appName),
-	Run: func(cmd *cobra.Command, args []string) {
+	Run: func(cmd *cobra.Command, args []string) { //nolint:revive
 		fmt.Printf("%s v%s\n", appName, appVersion) //nolint:forbidigo
 	},
 }

config/add.go

@@ -49,7 +49,7 @@ func (c *Config) add(name string, newService Service) error {
 
 // most of codes are from:
 // https://github.com/containers/podman/blob/main/cmd/podman/system/connection/add.go.
-func validateNewService(name string, dest string, identity string) (Service, error) { //nolint:gocognit,cyclop
+func validateNewService(name string, dest string, identity string) (Service, error) { //nolint:cyclop
 	var (
 		service         Service
 		serviceIdentity string
@@ -63,7 +63,7 @@ func validateNewService(name string, dest string, identity string) (Service, err
 		return service, ErrEmptyURIDestination
 	}
 
-	if match, err := regexp.Match("^[A-Za-z][A-Za-z0-9+.-]*://", []byte(dest)); err != nil {
+	if match, err := regexp.Match("^[A-Za-z][A-Za-z0-9+.-]*://", []byte(dest)); err != nil { //nolint:mirror
 		return service, fmt.Errorf("%w invalid destition", err)
 	} else if !match {
 		dest = "ssh://" + dest

pdcs/images/import.go

@@ -39,7 +39,9 @@ func Import(opts ImageImportOptions) (string, error) {
 		if err != nil {
 			return "", err
 		}
+
 		defer tarFile.Close()
+
 		reader = bufio.NewReader(tarFile)
 	}
 

pdcs/images/search.go

@@ -1,7 +1,7 @@
 package images
 
 import (
-	"fmt"
+	"strconv"
 
 	"github.com/containers/podman-tui/pdcs/registry"
 	"github.com/containers/podman/v4/pkg/bindings/images"
@@ -29,7 +29,7 @@ func Search(term string) ([][]string, error) {
 			sReport.Index,
 			sReport.Name,
 			sReport.Description,
-			fmt.Sprintf("%d", sReport.Stars),
+			strconv.Itoa(sReport.Stars),
 			sReport.Official,
 			sReport.Automated,
 		})

pdcs/registry/connection.go

@@ -40,8 +40,8 @@ func GetConnection() (context.Context, error) {
 
 		ctx := context.Background()
 		ctx, cancel := context.WithCancel(ctx)
-		conn, err = bindings.NewConnectionWithIdentity(ctx, connURI.String(), ConnectionIdentity(), false)
 
+		conn, err = bindings.NewConnectionWithIdentity(ctx, connURI.String(), ConnectionIdentity(), false)
 		if err != nil {
 			cancel()
 

pdcs/sysinfo/df.go

@@ -2,6 +2,7 @@ package sysinfo
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/containers/podman-tui/pdcs/registry"
 	"github.com/containers/podman/v4/pkg/bindings/system"
@@ -124,12 +125,12 @@ func (dfsum *DfSummary) Type() string {
 
 // Total returns total value of df summary.
 func (dfsum *DfSummary) Total() string {
-	return fmt.Sprintf("%d", dfsum.total)
+	return strconv.Itoa(dfsum.total)
 }
 
 // Active returns active value of df summary.
 func (dfsum *DfSummary) Active() string {
-	return fmt.Sprintf("%d", dfsum.active)
+	return strconv.Itoa(dfsum.active)
 }
 
 // Size returns size value of df summary.

pdcs/utils/defaults.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"fmt"
+	"errors"
 
 	"github.com/containers/podman/v4/libpod/define"
 	"github.com/containers/podman/v4/pkg/domain/entities"
@@ -14,13 +14,13 @@ const (
 
 var (
 	// ErrEmptyVolDest empty volume destination error.
-	ErrEmptyVolDest = fmt.Errorf("volume destination cannot be empty")
+	ErrEmptyVolDest = errors.New("volume destination cannot be empty")
 	// ErrTopPodNotRunning top error while pod not running.
-	ErrTopPodNotRunning = fmt.Errorf("pods top can only be used on running pods")
+	ErrTopPodNotRunning = errors.New("pods top can only be used on running pods")
 	// ErrInvalidIPAddress invalid IP address error.
-	ErrInvalidIPAddress = fmt.Errorf("invalid IP address")
+	ErrInvalidIPAddress = errors.New("invalid IP address")
 	// ErrInvalidDNSAddress invalid DNS server address error.
-	ErrInvalidDNSAddress = fmt.Errorf("invalid DNS address")
+	ErrInvalidDNSAddress = errors.New("invalid DNS address")
 )
 
 // DefineCreateDefaults sets default container create options.

ui/containers/cntdialogs/commit.go

@@ -74,7 +74,7 @@ func NewContainerCommitDialog() *ContainerCommitDialog {
 	cntInfoLabel := "CONTAINER ID:" //nolint:goconst
 
 	dialog.cntInfo.SetBackgroundColor(style.DialogBgColor)
-	dialog.cntInfo.SetLabel("[::b]" + cntInfoLabel)
+	dialog.cntInfo.SetLabel("[::b]" + cntInfoLabel) //nolint:goconst
 	dialog.cntInfo.SetLabelWidth(len(cntInfoLabel) + 1)
 	dialog.cntInfo.SetFieldBackgroundColor(style.DialogBgColor)
 	dialog.cntInfo.SetLabelStyle(tcell.StyleDefault.

ui/containers/cntdialogs/exec.go

@@ -453,6 +453,7 @@ func (d *ContainerExecDialog) Focus(delegate func(p tview.Primitive)) { //nolint
 
 				return nil
 			}
+
 			if event.Key() == tcell.KeyEnter {
 				d.execHandler()
 

ui/containers/cntdialogs/stats.go

@@ -349,7 +349,7 @@ func (d *ContainerStatsDialog) setContainerPID(pids uint64) {
 	defer d.mu.Unlock()
 
 	if pids != 0 {
-		cntPIDS = fmt.Sprintf("%d", pids)
+		cntPIDS = fmt.Sprintf("%d", pids) //nolint:perfsprint
 	}
 
 	d.table.GetCell(containerPidsCell.row, containerPidsCell.col).SetText(cntPIDS).SetTextColor(fgColor)

ui/containers/commands.go

@@ -680,7 +680,8 @@ func (cnt *Containers) rm() {
 	bgColor := style.GetColorHex(style.DialogBorderColor)
 	fgColor := style.GetColorHex(style.DialogFgColor)
 	containerItem := fmt.Sprintf("[%s:%s:b]CONTAINER ID:[:-:-] %s(%s)", fgColor, bgColor, cntID, cntName)
-	description := fmt.Sprintf("%s\n\nAre you sure you want to remove the selected container ?", containerItem)
+	description := fmt.Sprintf("%s\n\nAre you sure you want to remove the selected container ?", //nolint:perfsprint
+		containerItem)
 
 	cnt.confirmDialog.SetText(description)
 	cnt.confirmDialog.Display()

ui/containers/containers.go

@@ -133,12 +133,12 @@ func NewContainers() *Containers {
 
 	for i := 0; i < len(containers.headers); i++ {
 		containers.table.SetCell(0, i,
-			tview.NewTableCell(fmt.Sprintf("[black::b]%s", strings.ToUpper(containers.headers[i]))).
-				SetExpansion(1).
-				SetBackgroundColor(style.PageHeaderBgColor).
-				SetTextColor(style.PageHeaderFgColor).
-				SetAlign(tview.AlignLeft).
-				SetSelectable(false))
+			tview.NewTableCell(fmt.Sprintf("[black::b]%s", strings.ToUpper(containers.headers[i]))). //nolint:perfsprint
+															SetExpansion(1).
+															SetBackgroundColor(style.PageHeaderBgColor).
+															SetTextColor(style.PageHeaderFgColor).
+															SetAlign(tview.AlignLeft).
+															SetSelectable(false))
 	}
 
 	containers.table.SetFixed(1, 1)
@@ -164,6 +164,7 @@ func NewContainers() *Containers {
 	// set confirm dialogs functions
 	containers.confirmDialog.SetSelectedFunc(func() {
 		containers.confirmDialog.Hide()
+
 		switch containers.confirmData {
 		case "prune":
 			containers.prune()

ui/containers/data.go

@@ -51,12 +51,12 @@ func (cnt *Containers) ClearData() {
 
 	for i := 0; i < len(cnt.headers); i++ {
 		cnt.table.SetCell(0, i,
-			tview.NewTableCell(fmt.Sprintf("[::b]%s", strings.ToUpper(cnt.headers[i]))).
-				SetExpansion(expand).
-				SetBackgroundColor(bgColor).
-				SetTextColor(fgColor).
-				SetAlign(tview.AlignLeft).
-				SetSelectable(false))
+			tview.NewTableCell(fmt.Sprintf("[::b]%s", strings.ToUpper(cnt.headers[i]))). //nolint:perfsprint
+													SetExpansion(expand).
+													SetBackgroundColor(bgColor).
+													SetTextColor(fgColor).
+													SetAlign(tview.AlignLeft).
+													SetSelectable(false))
 	}
 
 	cnt.table.SetTitle(fmt.Sprintf("[::b]%s[0]", strings.ToUpper(cnt.title)))

ui/containers/refresh.go

@@ -20,12 +20,12 @@ func (cnt *Containers) refresh() {
 
 	for i := 0; i < len(cnt.headers); i++ {
 		cnt.table.SetCell(0, i,
-			tview.NewTableCell(fmt.Sprintf("[::b]%s", strings.ToUpper(cnt.headers[i]))).
-				SetExpansion(expand).
-				SetBackgroundColor(style.PageHeaderBgColor).
-				SetTextColor(style.PageHeaderFgColor).
-				SetAlign(tview.AlignLeft).
-				SetSelectable(false))
+			tview.NewTableCell(fmt.Sprintf("[::b]%s", strings.ToUpper(cnt.headers[i]))). //nolint:perfsprint
+													SetExpansion(expand).
+													SetBackgroundColor(style.PageHeaderBgColor).
+													SetTextColor(style.PageHeaderFgColor).
+													SetAlign(tview.AlignLeft).
+													SetSelectable(false))
 	}
 
 	rowIndex := 1

ui/dialogs/confirm.go

@@ -174,6 +174,7 @@ func (d *ConfirmDialog) Draw(screen tcell.Screen) {
 func (d *ConfirmDialog) InputHandler() func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
 	return d.WrapInputHandler(func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
 		log.Debug().Msgf("confirm dialog: event %v received", event)
+
 		if event.Key() == tcell.KeyEsc {
 			d.cancelHandler()
 

ui/dialogs/error.go

@@ -29,7 +29,7 @@ func NewErrorDialog() *ErrorDialog {
 
 	dialog.modal.SetButtonBackgroundColor(style.ErrorDialogButtonBgColor)
 
-	dialog.modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) {
+	dialog.modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) { //nolint:revive
 		dialog.Hide()
 	})
 
@@ -78,6 +78,7 @@ func (d *ErrorDialog) Focus(delegate func(p tview.Primitive)) {
 func (d *ErrorDialog) InputHandler() func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
 	return d.WrapInputHandler(func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
 		log.Debug().Msgf("error dialog: event %v received", event)
+
 		if modalHandler := d.modal.InputHandler(); modalHandler != nil {
 			modalHandler(event, setFocus)
 
@@ -115,7 +116,7 @@ func (d *ErrorDialog) Draw(screen tcell.Screen) {
 
 // SetDoneFunc sets modal done function.
 func (d *ErrorDialog) SetDoneFunc(handler func()) *ErrorDialog {
-	d.modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) {
+	d.modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) { //nolint:revive
 		handler()
 	})
 

ui/dialogs/input.go

@@ -179,7 +179,7 @@ func (d *SimpleInputDialog) SetLabel(text string) {
 
 	d.input.SetFieldWidth(d.inputWidth)
 
-	label := fmt.Sprintf("%s: ", text)
+	label := fmt.Sprintf("%s: ", text) //nolint:perfsprint
 
 	d.input.SetLabel(label)
 }
@@ -228,6 +228,7 @@ func (d *SimpleInputDialog) Focus(delegate func(p tview.Primitive)) {
 func (d *SimpleInputDialog) InputHandler() func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
 	return d.WrapInputHandler(func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
 		log.Debug().Msgf("input dialog: event %v received", event)
+
 		if event.Key() == tcell.KeyEsc {
 			d.cancelHandler()
 

ui/dialogs/message.go

@@ -220,6 +220,7 @@ func (d *MessageDialog) Draw(screen tcell.Screen) {
 func (d *MessageDialog) InputHandler() func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
 	return d.WrapInputHandler(func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
 		log.Debug().Msgf("message dialog: event %v received", event)
+
 		if event.Key() == tcell.KeyEsc {
 			d.cancelHandler()
 

ui/dialogs/progress.go

@@ -90,7 +90,7 @@ func (d *ProgressDialog) IsDisplay() bool {
 }
 
 // Focus is called when this primitive receives focus.
-func (d *ProgressDialog) Focus(delegate func(p tview.Primitive)) {}
+func (d *ProgressDialog) Focus(delegate func(p tview.Primitive)) {} //nolint:revive
 
 // HasFocus returns whether or not this primitive has focus.
 func (d *ProgressDialog) HasFocus() bool {
@@ -99,7 +99,7 @@ func (d *ProgressDialog) HasFocus() bool {
 
 // InputHandler returns input handler function for this primitive.
 func (d *ProgressDialog) InputHandler() func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
-	return d.WrapInputHandler(func(event *tcell.EventKey, setFocus func(p tview.Primitive)) {
+	return d.WrapInputHandler(func(event *tcell.EventKey, setFocus func(p tview.Primitive)) { //nolint:revive
 		log.Debug().Msgf("progress dialog: event %v received", event)
 	})
 }
@@ -120,14 +120,14 @@ func (d *ProgressDialog) tickStr(max int) string {
 	prgStr := ""
 
 	for i := 0; i < d.counterValue; i++ {
-		prgHeadStr += fmt.Sprintf("[black::]%s", prgCell)
+		prgHeadStr += fmt.Sprintf("[black::]%s", prgCell) //nolint:perfsprint
 		hWidth++
 	}
 
 	prgStr = prgCell + prgCell + prgCell + prgCell
 
 	for i := 0; i < max+hWidth+4; i++ {
-		prgEndStr += fmt.Sprintf("[black::]%s", prgCell)
+		prgEndStr += fmt.Sprintf("[black::]%s", prgCell) //nolint:perfsprint
 	}
 
 	progress := fmt.Sprintf("%s[%s::]%s%s", prgHeadStr, barColor, prgStr, prgEndStr)

ui/help/help.go

@@ -66,10 +66,10 @@ func NewHelp(appName string, appVersion string) *Help {
 		}
 
 		keyinfo.SetCell(rowIndex, colIndex,
-			tview.NewTableCell(fmt.Sprintf("%s:", utils.UIKeysBindings[i].KeyLabel)).
-				SetAlign(tview.AlignRight).
-				SetBackgroundColor(bgColor).
-				SetSelectable(true).SetTextColor(headerColor))
+			tview.NewTableCell(fmt.Sprintf("%s:", utils.UIKeysBindings[i].KeyLabel)). //nolint:perfsprint
+													SetAlign(tview.AlignRight).
+													SetBackgroundColor(bgColor).
+													SetSelectable(true).SetTextColor(headerColor))
 
 		keyinfo.SetCell(rowIndex, colIndex+1,
 			tview.NewTableCell(utils.UIKeysBindings[i].KeyDesc).

ui/images/commands.go

@@ -267,7 +267,7 @@ func (img *Images) rm() {
 	bgColor := style.GetColorHex(style.DialogBorderColor)
 	fgColor := style.GetColorHex(style.DialogFgColor)
 	imageItem := fmt.Sprintf("[%s:%s:b]IMAGE ID:[:-:-] %s (%s)", fgColor, bgColor, imageID, imageName)
-	description := fmt.Sprintf("%s\n\nAre you sure you want to remove the selected image?", imageItem)
+	description := fmt.Sprintf("%s\n\nAre you sure you want to remove the selected image?", imageItem) //nolint:perfsprint
 
 	img.confirmDialog.SetText(description)
 	img.confirmDialog.Display()

ui/images/data.go

@@ -47,12 +47,12 @@ func (img *Images) ClearData() {
 
 	for i := 0; i < len(img.headers); i++ {
 		img.table.SetCell(0, i,
-			tview.NewTableCell(fmt.Sprintf("[::b]%s", strings.ToUpper(img.headers[i]))).
-				SetExpansion(expand).
-				SetBackgroundColor(bgColor).
-				SetTextColor(fgColor).
-				SetAlign(tview.AlignLeft).
-				SetSelectable(false))
+			tview.NewTableCell(fmt.Sprintf("[::b]%s", strings.ToUpper(img.headers[i]))). //nolint:perfsprint
+													SetExpansion(expand).
+													SetBackgroundColor(bgColor).
+													SetTextColor(fgColor).
+													SetAlign(tview.AlignLeft).
+													SetSelectable(false))
 	}
 
 	img.table.SetTitle(fmt.Sprintf("[::b]%s[0]", strings.ToUpper(img.title)))