Merge branch 'main' into wifi

Author: jspc

.github/workflows/go.yml

@@ -11,42 +11,47 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        go-version: '>=1.20.0'
 
-    # - name: Lint
-    #   uses: Jerome1337/golint-action@v1.0.2
-    #   with:
-    #     golint-path: './...'
+    - name: golangci-lint
+      run: |
+        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2
+        golangci-lint run --skip-files='.*_test.go'
 
     - name: Build
-      run: make linux-utils
+      run: make
 
     - name: Test
       run: go test -v -covermode=count -coverprofile=coverage.out ./...
 
     - name: Convert coverage to lcov
-      uses: jandelgado/gcov2lcov-action@v1.0.8
+      uses: jandelgado/gcov2lcov-action@v1.0.9
 
     - name: Coveralls
-      uses: coverallsapp/github-action@v1.1.2
+      uses: coverallsapp/github-action@1.1.3
       with:
         github-token: ${{ secrets.github_token }}
         path-to-lcov: coverage.lcov
 
-
   sonarcloud:
     runs-on: ubuntu-latest
+    if: ${{ github.triggering_actor != 'dependabot[bot]' }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         # Disabling shallow clone is recommended for improving relevancy of reporting
         fetch-depth: 0
 
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: '>=1.20.0'
+
     - name: Test
       run: go test -covermode=count -coverprofile=coverage.out ./...
 

Makefile

@@ -12,9 +12,9 @@ CONFIGS := $(CONFDIR)/eth0.toml.sample
 
 INSTALLERS := $(PREFIX)/Makefile
 
-BUILT_ON := $(shell date --rfc-3339=seconds | sed 's/ /T/')
-BUILT_BY := $(shell whoami)
-BUILD_REF := $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
+BUILT_ON ?= $(shell date --rfc-3339=seconds | sed 's/ /T/')
+BUILT_BY ?= $(shell whoami)
+BUILD_REF ?= $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
 
 .PHONY: default package
 

bin/cmd/netctl_up_test.go

@@ -1,18 +1,16 @@
+//go:build linux
 // +build linux
 
 package cmd
 
 import (
 	"bytes"
-	"io/ioutil"
+	"os"
 	"testing"
 )
 
 func TestNetctl_Up(t *testing.T) {
-	dir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("unexpected error: %#v", err)
-	}
+	dir, _ := os.MkdirTemp("", "")
 
 	for _, test := range []struct {
 		name        string

bin/cmd/root.go

@@ -5,16 +5,16 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+ 3. Neither the name of the copyright holder nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -38,11 +38,6 @@ import (
 	"github.com/vinyl-linux/linux-utils/netctl"
 )
 
-var (
-	dollar0   string
-	useString string
-)
-
 // Command Line args
 var (
 	basedir      string

bin/cmd/useradd_test.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -14,7 +13,7 @@ import (
 func tmpFileAndCopy(in string) (fn string, err error) {
 	// copy test.pwdFile to some tmpfile
 	// re-open pwd pointing to it
-	tmp, err := ioutil.TempFile("", "")
+	tmp, err := os.CreateTemp("", "")
 	if err != nil {
 		return
 	}
@@ -35,8 +34,6 @@ func tmpFileAndCopy(in string) (fn string, err error) {
 }
 
 func TestUseradd(t *testing.T) {
-	dollar0 = "useradd"
-
 	for _, test := range []struct {
 		name        string
 		args        []string
@@ -87,7 +84,7 @@ func TestUseradd(t *testing.T) {
 			rootCmd.SetOut(b)
 
 			reset()
-			basedir, _ = ioutil.TempDir("", "")
+			basedir, _ = os.MkdirTemp("", "")
 
 			err = rootCmd.Execute()
 			if err == nil && test.expectError {

bin/cmd/version_test.go

@@ -2,7 +2,7 @@ package cmd
 
 func ExampleVersion() {
 	rootCmd.SetArgs([]string{"version"})
-	rootCmd.Execute()
+	_ = rootCmd.Execute()
 	// output:
 	// linux-utils version
 	// ---

go.mod

@@ -1,25 +1,29 @@
 module github.com/vinyl-linux/linux-utils
 
-go 1.17
+go 1.20
 
 require (
-	github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294
-	github.com/otiai10/copy v1.4.2
-	github.com/pelletier/go-toml v1.9.4
-	github.com/spf13/cobra v1.3.0
+	github.com/insomniacslk/dhcp v0.0.0-20230220063916-5369909a5de7
+	github.com/otiai10/copy v1.9.0
+	github.com/pelletier/go-toml v1.9.5
+	github.com/spf13/cobra v1.6.1
 	github.com/vishvananda/netlink v1.1.0
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
 	pifke.org/wpasupplicant v0.0.0-20200816231324-12bdf536389f
 )
 
 require (
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
-	github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/josharian/native v1.1.0 // indirect
+	github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 // indirect
+	github.com/mdlayher/packet v1.1.1 // indirect
+	github.com/mdlayher/raw v0.1.0 // indirect
+	github.com/mdlayher/socket v0.4.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/u-root/u-root v7.0.0+incompatible // indirect
-	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
-	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
-	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
-	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
+	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
 )