Merge pull request #531 from navidys/golangci_lint

golangci-lint update 1.61.0

.golangci.yml

@@ -1,7 +1,6 @@
 run:
+  timeout: 10m
   deadline: 5m
-  skip-files:
-    - ".*_test.go"
 linters:
   enable-all: true
   disable:
@@ -17,22 +16,19 @@ linters:
     - wastedassign
     - rowserrcheck
     # deprecated
-    - nosnakecase
-    - varcheck
-    - structcheck
-    - ifshort
-    - deadcode
-    - golint
-    - maligned
-    - interfacer
-    - scopelint
-    - exhaustivestruct
+    - gomnd
     - gomoddirectives
+    - exportloopref
 linters-settings:
 #  typecheck:
 #    enabled: false
   errcheck:
     check-blank: false
-    ignore: fmt:.*
+    exclude-functions:
+      - fmt:.*
   nolintlint:
     require-specific: true
+
+issues:
+  exclude-files:
+    - ".*_test.go"

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.56.2 ./hack/install_golangci.sh
+	VERSION=1.61.0 ./hack/install_golangci.sh
 
 .PHONY: .install.codespell
 .install.codespell:

app/app.go

@@ -51,7 +51,7 @@ func NewApp(name string, version string) *App {
 		Application:     tview.NewApplication(),
 		pages:           tview.NewPages(),
 		needInitUI:      false,
-		fastRefreshChan: make(chan bool, 10), //nolint:gomnd
+		fastRefreshChan: make(chan bool, 10), //nolint:mnd
 	}
 
 	var err error

app/menu.go

@@ -16,9 +16,9 @@ func newMenu(menuItems [][]string) *tview.TextView {
 
 	menu.SetBackgroundColor(style.BgColor)
 
-	var menuList []string
+	menuList := []string{}
 
-	for i := 0; i < len(menuItems); i++ {
+	for i := range menuItems {
 		key, item := genMenuItem(menuItems[i])
 		if i == len(menuItems)-1 {
 			item += " "

app/screens.go

@@ -169,6 +169,6 @@ func (app *App) clearViewsData() {
 
 func (app *App) clearInfoUIData() {
 	app.infoBar.UpdateBasicInfo("", "", "")
-	app.infoBar.UpdateSystemUsageInfo(0.00, 0.00) //nolint:gomnd
+	app.infoBar.UpdateSystemUsageInfo(0.00, 0.00) //nolint:mnd
 	app.infoBar.UpdatePodmanInfo("", "", "", "")
 }

config/write.go

@@ -22,11 +22,11 @@ func (c *Config) Write() error {
 
 	log.Debug().Msgf("config: write configuration file %q", path)
 
-	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { //nolint:gomnd
+	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { //nolint:mnd
 		return err
 	}
 
-	configFile, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o640) //nolint:gomnd
+	configFile, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o640) //nolint:mnd
 	if err != nil {
 		return err
 	}

pdcs/containers/create.go

@@ -102,7 +102,7 @@ func Create(opts CreateOptions) ([]string, error) { //nolint:cyclop,gocognit,goc
 			return warningResponse, fmt.Errorf("%w: %s", ErrInvalidCreateTimeout, opts.Timeout)
 		}
 
-		createOptions.Timeout = uint(timeout)
+		createOptions.Timeout = uint(timeout) //nolint:gosec
 	}
 
 	createOptions.Hostname = opts.Hostname

pdcs/containers/top.go

@@ -13,7 +13,7 @@ import (
 func Top(id string) ([][]string, error) {
 	log.Debug().Msgf("pdcs: podman container top %s", id)
 
-	var report [][]string
+	report := [][]string{}
 
 	conn, err := registry.GetConnection()
 	if err != nil {
@@ -25,7 +25,7 @@ func Top(id string) ([][]string, error) {
 		return report, err
 	}
 
-	for i := 0; i < len(response); i++ {
+	for i := range response {
 		space := regexp.MustCompile(`\s+`)
 		line := space.ReplaceAllString(response[i], " ")
 		split := strings.Split(line, " ")

pdcs/images/history.go

@@ -14,7 +14,7 @@ import (
 func History(id string) ([][]string, error) {
 	log.Debug().Msgf("pdcs: podman image history %s", id)
 
-	var report [][]string
+	report := [][]string{}
 
 	conn, err := registry.GetConnection()
 	if err != nil {
@@ -26,7 +26,7 @@ func History(id string) ([][]string, error) {
 		return report, err
 	}
 
-	for i := 0; i < len(response); i++ {
+	for i := range response {
 		report = append(report, []string{
 			response[i].ID,
 			units.HumanDuration(time.Since(time.Unix(response[i].Created, 0))) + " ago",

pdcs/images/save.go

@@ -47,7 +47,7 @@ func Save(imageID string, opts ImageSaveOptions) error { //nolint:cyclop
 	defer outputFile.Close()
 
 	cancelChan := make(chan bool, 1)
-	writerChan := make(chan []byte, 1024) //nolint:gomnd
+	writerChan := make(chan []byte, 1024) //nolint:mnd
 	outputWriter := channel.NewWriter(writerChan)
 
 	writeOutputFunc := func() {

pdcs/pods/top.go

@@ -14,7 +14,7 @@ import (
 func Top(id string) ([][]string, error) {
 	log.Debug().Msgf("pdcs: podman pod top %s", id)
 
-	var report [][]string
+	report := [][]string{}
 
 	conn, err := registry.GetConnection()
 	if err != nil {
@@ -26,7 +26,7 @@ func Top(id string) ([][]string, error) {
 		return report, err
 	}
 
-	for i := 0; i < len(response); i++ {
+	for i := range response {
 		if response[i] == "" {
 			continue
 		}

pdcs/sysinfo/df.go

@@ -140,7 +140,7 @@ func (dfsum *DfSummary) Size() string {
 
 // Reclaimable returns reclaimable value of df summary.
 func (dfsum *DfSummary) Reclaimable() string {
-	percent := int(float64(dfsum.reclaimable)/float64(dfsum.size)) * 100 //nolint:gomnd
+	percent := int(float64(dfsum.reclaimable)/float64(dfsum.size)) * 100 //nolint:mnd
 
 	return fmt.Sprintf("%s (%d%%)", units.HumanSize(float64(dfsum.reclaimable)), percent)
 }

pdcs/sysinfo/sysinfo.go

@@ -39,8 +39,8 @@ func SysInfo() (*SystemInfo, error) {
 	info.Kernel = response.Host.Kernel
 	memUsed := response.Host.MemTotal - response.Host.MemFree
 	swapUsed := response.Host.SwapTotal - response.Host.SwapFree
-	info.MemUsagePC = float64(memUsed*100) / float64(response.Host.MemTotal)    //nolint:gomnd
-	info.SwapUsagePC = float64(swapUsed*100) / float64(response.Host.SwapTotal) //nolint:gomnd
+	info.MemUsagePC = float64(memUsed*100) / float64(response.Host.MemTotal)    //nolint:mnd
+	info.SwapUsagePC = float64(swapUsed*100) / float64(response.Host.SwapTotal) //nolint:mnd
 
 	info.Runtime = response.Host.OCIRuntime.Version
 	info.BuildahVersion = response.Host.BuildahVersion

pdcs/utils/utils.go

@@ -12,7 +12,7 @@ import (
 
 // SizeToStr converts size to human readable format.
 func SizeToStr(size int64) string {
-	return units.HumanSizeWithPrecision(float64(size), 3) //nolint:gomnd
+	return units.HumanSizeWithPrecision(float64(size), 3) //nolint:mnd
 }
 
 // CreatedToStr converts duration to human readable format.

ui/containers/cntdialogs/checkpoint.go

@@ -190,13 +190,13 @@ func NewContainerCheckpointDialog() *ContainerCheckpointDialog {
 	optionsLayoutRow01.AddItem(dialog.export, 1, 0, true)
 
 	optionsLayoutRow02 := tview.NewFlex().SetDirection(tview.FlexColumn)
-	optionsLayoutRow02.AddItem(dialog.fileLock, labelWidth+2, 0, true) //nolint:gomnd
+	optionsLayoutRow02.AddItem(dialog.fileLock, labelWidth+2, 0, true) //nolint:mnd
 	optionsLayoutRow02.AddItem(dialog.ignoreRootFS, 0, 1, true)
 	optionsLayoutRow02.AddItem(dialog.tcpEstablished, 0, 1, true)
 	optionsLayoutRow02.AddItem(dialog.preCheckpoint, 0, 1, true)
 
 	optionsLayoutRow03 := tview.NewFlex().SetDirection(tview.FlexColumn)
-	optionsLayoutRow03.AddItem(dialog.printStats, labelWidth+2, 1, true) //nolint:gomnd
+	optionsLayoutRow03.AddItem(dialog.printStats, labelWidth+2, 1, true) //nolint:mnd
 	optionsLayoutRow03.AddItem(dialog.keep, 0, 1, true)
 	optionsLayoutRow03.AddItem(dialog.leaveRunning, 0, 1, true)
 	optionsLayoutRow03.AddItem(dialog.withPrevious, 0, 1, true)
@@ -433,13 +433,13 @@ func (d *ContainerCheckpointDialog) InputHandler() func(event *tcell.EventKey, s
 // SetRect set rects for this primitive.
 func (d *ContainerCheckpointDialog) SetRect(x, y, width, height int) {
 	if width > cntCheckpointDialogMaxWidth {
-		emptySpace := (width - cntCheckpointDialogMaxWidth) / 2 //nolint:gomnd
+		emptySpace := (width - cntCheckpointDialogMaxWidth) / 2 //nolint:mnd
 		x += emptySpace
 		width = cntCheckpointDialogMaxWidth
 	}
 
 	if height > cntCheckpointDialogMaxHeight {
-		emptySpace := (height - cntCheckpointDialogMaxHeight) / 2 //nolint:gomnd
+		emptySpace := (height - cntCheckpointDialogMaxHeight) / 2 //nolint:mnd
 		y += emptySpace
 		height = cntCheckpointDialogMaxHeight
 	}
@@ -474,7 +474,7 @@ func (d *ContainerCheckpointDialog) SetCheckpointFunc(handler func()) *Container
 // SetCancelFunc sets form cancel button selected function.
 func (d *ContainerCheckpointDialog) SetCancelFunc(handler func()) *ContainerCheckpointDialog {
 	d.cancelHandler = handler
-	cancelButton := d.form.GetButton(d.form.GetButtonCount() - 2) //nolint:gomnd
+	cancelButton := d.form.GetButton(d.form.GetButtonCount() - 2) //nolint:mnd
 
 	cancelButton.SetSelectedFunc(handler)
 

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) //nolint:goconst
+	dialog.cntInfo.SetLabel("[::b]" + cntInfoLabel)
 	dialog.cntInfo.SetLabelWidth(len(cntInfoLabel) + 1)
 	dialog.cntInfo.SetFieldBackgroundColor(style.DialogBgColor)
 	dialog.cntInfo.SetLabelStyle(tcell.StyleDefault.
@@ -154,7 +154,7 @@ func NewContainerCommitDialog() *ContainerCommitDialog {
 	iaLayout := tview.NewFlex().SetDirection(tview.FlexColumn)
 	iaLayout.SetBackgroundColor(style.DialogBgColor)
 	iaLayout.AddItem(dialog.image, 0, 1, true)
-	iaLayout.AddItem(utils.EmptyBoxSpace(style.DialogBgColor), 2, 0, false) //nolint:gomnd
+	iaLayout.AddItem(utils.EmptyBoxSpace(style.DialogBgColor), 2, 0, false) //nolint:mnd
 	iaLayout.AddItem(dialog.author, 0, 1, true)
 
 	// dropdown and checkbox layout row
@@ -388,13 +388,13 @@ func (d *ContainerCommitDialog) setFocusElement() {
 // SetRect set rects for this primitive.
 func (d *ContainerCommitDialog) SetRect(x, y, width, height int) {
 	if width > cntCommitDialogMaxWidth {
-		emptySpace := (width - cntCommitDialogMaxWidth) / 2 //nolint:gomnd
+		emptySpace := (width - cntCommitDialogMaxWidth) / 2 //nolint:mnd
 		x += emptySpace
 		width = cntCommitDialogMaxWidth
 	}
 
 	if height > cntCommitDialogMaxHeight {
-		emptySpace := (height - cntCommitDialogMaxHeight) / 2 //nolint:gomnd
+		emptySpace := (height - cntCommitDialogMaxHeight) / 2 //nolint:mnd
 		y += emptySpace
 		height = cntCommitDialogMaxHeight
 	}
@@ -429,7 +429,7 @@ func (d *ContainerCommitDialog) SetCommitFunc(handler func()) *ContainerCommitDi
 // SetCancelFunc sets form cancel button selected function.
 func (d *ContainerCommitDialog) SetCancelFunc(handler func()) *ContainerCommitDialog {
 	d.cancelHandler = handler
-	cancelButton := d.form.GetButton(d.form.GetButtonCount() - 2) //nolint:gomnd
+	cancelButton := d.form.GetButton(d.form.GetButtonCount() - 2) //nolint:mnd
 
 	cancelButton.SetSelectedFunc(handler)
 

ui/containers/cntdialogs/create.go

@@ -305,7 +305,7 @@ func (d *ContainerCreateDialog) setupLayout() {
 	_, layoutWidth := utils.AlignStringListWidth(d.categoryLabels)
 	layout := tview.NewFlex().SetDirection(tview.FlexColumn)
 
-	layout.AddItem(d.categories, layoutWidth+6, 0, true) //nolint:gomnd
+	layout.AddItem(d.categories, layoutWidth+6, 0, true) //nolint:mnd
 	layout.AddItem(d.categoryPages, 0, 1, true)
 	layout.SetBackgroundColor(bgColor)
 	d.layout.AddItem(layout, 0, 1, true)
@@ -1273,13 +1273,13 @@ func (d *ContainerCreateDialog) InputHandler() func(event *tcell.EventKey, setFo
 // SetRect set rects for this primitive.
 func (d *ContainerCreateDialog) SetRect(x, y, width, height int) {
 	if width > containerCreateDialogMaxWidth {
-		emptySpace := (width - containerCreateDialogMaxWidth) / 2 //nolint:gomnd
+		emptySpace := (width - containerCreateDialogMaxWidth) / 2 //nolint:mnd
 		x += emptySpace
 		width = containerCreateDialogMaxWidth
 	}
 
 	if height > containerCreateDialogHeight {
-		emptySpace := (height - containerCreateDialogHeight) / 2 //nolint:gomnd
+		emptySpace := (height - containerCreateDialogHeight) / 2 //nolint:mnd
 		y += emptySpace
 		height = containerCreateDialogHeight
 	}
@@ -1304,7 +1304,7 @@ func (d *ContainerCreateDialog) Draw(screen tcell.Screen) {
 // SetCancelFunc sets form cancel button selected function.
 func (d *ContainerCreateDialog) SetCancelFunc(handler func()) *ContainerCreateDialog {
 	d.cancelHandler = handler
-	cancelButton := d.form.GetButton(d.form.GetButtonCount() - 2) //nolint:gomnd
+	cancelButton := d.form.GetButton(d.form.GetButtonCount() - 2) //nolint:mnd
 
 	cancelButton.SetSelectedFunc(handler)
 
@@ -1331,11 +1331,11 @@ func (d *ContainerCreateDialog) setActiveCategory(index int) {
 
 	d.categories.Clear()
 
-	var ctgList []string
+	ctgList := []string{}
 
 	alignedList, _ := utils.AlignStringListWidth(d.categoryLabels)
 
-	for i := 0; i < len(alignedList); i++ {
+	for i := range alignedList {
 		if i == index {
 			ctgList = append(ctgList, fmt.Sprintf("[%s:%s:b]-> %s ", ctgTextColor, ctgBgColor, alignedList[i]))
 
@@ -1383,7 +1383,7 @@ func (d *ContainerCreateDialog) initData() {
 	d.imageList = imgList
 	imgOptions := []string{""}
 
-	for i := 0; i < len(d.imageList); i++ {
+	for i := range d.imageList {
 		if d.imageList[i].ID == "<none>" {
 			imgOptions = append(imgOptions, d.imageList[i].ID)
 
@@ -1399,15 +1399,15 @@ func (d *ContainerCreateDialog) initData() {
 	podList, _ := pods.List()
 	d.podList = podList
 
-	for i := 0; i < len(podList); i++ {
+	for i := range podList {
 		podOptions = append(podOptions, podList[i].Name)
 	}
 
 	// get available networks
 	networkOptions := []string{""}
 	networkList, _ := networks.List()
 
-	for i := 0; i < len(networkList); i++ {
+	for i := range networkList {
 		networkOptions = append(networkOptions, networkList[i][1])
 	}
 
@@ -1416,7 +1416,7 @@ func (d *ContainerCreateDialog) initData() {
 	volumeOptions := []string{""}
 	volList, _ := volumes.List()
 
-	for i := 0; i < len(volList); i++ {
+	for i := range volList {
 		volumeOptions = append(volumeOptions, volList[i].Name)
 	}
 

ui/containers/cntdialogs/exec.go

@@ -189,7 +189,7 @@ func NewContainerExecDialog() *ContainerExecDialog {
 	mLayout.AddItem(dialog.command, 1, 0, true)
 
 	// interactive, tty, privileged and detach
-	checkBoxWidth := execDialogLabelWidth + 4 //nolint:gomnd
+	checkBoxWidth := execDialogLabelWidth + 4 //nolint:mnd
 	labelPaddings := 5
 	checkBoxLayout := tview.NewFlex().SetDirection(tview.FlexColumn)
 
@@ -578,7 +578,7 @@ func (d *ContainerExecDialog) SetRect(x, y, width, height int) {
 	if width > execDialogMaxWidth {
 		wEmptySpace := width - execDialogMaxWidth
 		if wEmptySpace > 0 {
-			dX = x + (wEmptySpace / 2) //nolint:gomnd
+			dX = x + (wEmptySpace / 2) //nolint:mnd
 		}
 
 		dWidth = execDialogMaxWidth
@@ -591,7 +591,7 @@ func (d *ContainerExecDialog) SetRect(x, y, width, height int) {
 		hEmptySpace := height - execDialogMaxHeight
 
 		if hEmptySpace > 0 {
-			dY = y + (hEmptySpace / 2) //nolint:gomnd
+			dY = y + (hEmptySpace / 2) //nolint:mnd
 		}
 
 		dHeight = execDialogMaxHeight
@@ -618,7 +618,7 @@ func (d *ContainerExecDialog) Draw(screen tcell.Screen) {
 // SetCancelFunc sets form cancel button selected function.
 func (d *ContainerExecDialog) SetCancelFunc(handler func()) *ContainerExecDialog {
 	d.cancelHandler = handler
-	cancelButton := d.form.GetButton(d.form.GetButtonCount() - 2) //nolint:gomnd
+	cancelButton := d.form.GetButton(d.form.GetButtonCount() - 2) //nolint:mnd
 
 	cancelButton.SetSelectedFunc(handler)