Merge pull request #12 from hellt/fix-empty-cmd

Fix empty cmd set via cli from resetting inventory commands

Author: hellt

.github/workflows/cicd.yml

@@ -29,7 +29,7 @@ jobs:
       - name: set up go lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.40.1
+          version: v1.43.0
 
   build-and-release:
     runs-on: ubuntu-20.04

.gitignore

@@ -3,4 +3,7 @@
 outputs*
 dist
 cmdo
-private
+private
+# ignore clab dirs
+clab-*
+.*.clab.y?ml

.golangci.yml

@@ -104,20 +104,13 @@ linters:
     - testpackage
     - wsl
 
-issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - gomnd
-
 run:
   skip-dirs:
     - private
 
 # golangci.com configuration
 # https://github.com/golangci/golangci/wiki/Configuration
 service:
-  golangci-lint-version: 1.39.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.43.x # use the fixed version to not introduce new linters unexpectedly
   prepare:
     - echo "here I can run custom commands, but no preparation needed for this repo"

CHANGELOG.md

@@ -1,2 +1,3 @@
 lint:
-	docker run -it --rm -v $$(pwd):/app -w /app golangci/golangci-lint:v1.40.1 golangci-lint run -v
+	docker run -it --rm -v $$(pwd):/work ghcr.io/hellt/golines:0.8.0 golines -w .
+	docker run -it --rm -v $$(pwd):/app -w /app golangci/golangci-lint:v1.43.0 golangci-lint run -v

Makefile

@@ -1,7 +1,7 @@
 package commando
 
 import (
-	"io/ioutil"
+	"os"
 	"regexp"
 	"strings"
 
@@ -10,7 +10,7 @@ import (
 )
 
 func (app *appCfg) loadInventoryFromYAML(i *inventory) error {
-	yamlFile, err := ioutil.ReadFile(app.inventory)
+	yamlFile, err := os.ReadFile(app.inventory)
 	if err != nil {
 		return err
 	}
@@ -29,10 +29,13 @@ func (app *appCfg) loadInventoryFromYAML(i *inventory) error {
 	app.credentials = i.Credentials
 	app.transports = i.Transports
 
-	cmds := strings.Split(app.commands, "::")
+	// user-provided commands (via cli flag) take precedence over inventory
+	if app.commands != "" {
+		cmds := strings.Split(app.commands, "::")
 
-	for _, device := range i.Devices {
-		device.SendCommands = cmds
+		for _, device := range i.Devices {
+			device.SendCommands = cmds
+		}
 	}
 
 	return nil
@@ -85,7 +88,7 @@ func filterDevices(i *inventory, f string) {
 	fRe := regexp.MustCompile(f)
 
 	for n := range i.Devices {
-		if !fRe.Match([]byte(n)) {
+		if !fRe.MatchString(n) {
 			delete(i.Devices, n)
 		}
 	}

commando/inventory.go

@@ -2,7 +2,6 @@ package commando
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"strings"
@@ -124,21 +123,21 @@ func (w *fileWriter) WriteResponse(r []interface{}, name string) error {
 				c := sanitizeCmd(resp.ChannelInput)
 
 				rb := []byte(resp.Result)
-				if err := ioutil.WriteFile(path.Join(outDir, c), rb, filePermissions); err != nil {
+				if err := os.WriteFile(path.Join(outDir, c), rb, filePermissions); err != nil {
 					return err
 				}
 			}
 		case *cfg.Response:
 			rb := []byte(respObj.Result)
-			if err := ioutil.WriteFile(path.Join(outDir, respObj.OperationType), rb, filePermissions); err != nil {
+			if err := os.WriteFile(path.Join(outDir, respObj.OperationType), rb, filePermissions); err != nil {
 				return err
 			}
 		case *cfg.DiffResponse:
 			rb := []byte(
 				fmt.Sprintf("Device Diff:\n%s\n\nSide By Side Diff:\n%s\n\nUnified Diff:\n%s",
 					respObj.DeviceDiff, respObj.SideBySideDiff(), respObj.UnifiedDiff()),
 			)
-			if err := ioutil.WriteFile(path.Join(outDir, respObj.OperationType), rb, filePermissions); err != nil {
+			if err := os.WriteFile(path.Join(outDir, respObj.OperationType), rb, filePermissions); err != nil {
 				return err
 			}
 		}