From bc94ff11434bedacd65b7a7b2290adb8139979a0 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 7 Apr 2022 11:32:08 +0200 Subject: [PATCH 1/5] Cleanup TOOLS_DIR and updated linter version --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c7c42693..a7421035 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ CONFIG := $(shell pwd) GO_TOOLS_BIN := $(addprefix $(TOOLS_BIN)/, $(notdir $(GO_TOOLS))) GO_TOOLS_VENDOR := $(addprefix vendor/, $(GO_TOOLS)) GOLANGCI_LINT := $(TOOLS_BIN)/golangci-lint -GOLANGCI_LINT_VERSION := v1.31.0 +GOLANGCI_LINT_VERSION := v1.45.2 # use GOPROXY for older git clients and speed up downloads GOPROXY ?= https://proxy.golang.org @@ -245,6 +245,7 @@ clean: rm -f warewulf.spec rm -f config rm -f Defaults.mk + rm -rf $(TOOLS_DIR) install: files install_wwclient From 7e42286610308d20064622773bf23bd5402f185f Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 7 Apr 2022 11:32:31 +0200 Subject: [PATCH 2/5] fixed linting --- internal/app/wwctl/container/exec/child/main.go | 6 ++---- internal/app/wwctl/container/exec/main.go | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/internal/app/wwctl/container/exec/child/main.go b/internal/app/wwctl/container/exec/child/main.go index c24473c0..7a1d2d63 100644 --- a/internal/app/wwctl/container/exec/child/main.go +++ b/internal/app/wwctl/container/exec/child/main.go @@ -30,14 +30,12 @@ func CobraRunE(cmd *cobra.Command, args []string) error { os.Exit(1) } containerPath := container.RootFsDir(containerName) - passwdTime := time.Now() fileStat, _ := os.Stat(path.Join(containerPath, "/etc/passwd")) unixStat := fileStat.Sys().(*syscall.Stat_t) - passwdTime = time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)) - groupTime := time.Now() + passwdTime := time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)) fileStat, _ = os.Stat(path.Join(containerPath, "/etc/group")) unixStat = fileStat.Sys().(*syscall.Stat_t) - groupTime = time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)) + groupTime := time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)) wwlog.Printf(wwlog.DEBUG, "passwd: %v\n", passwdTime) wwlog.Printf(wwlog.DEBUG, "group: %v\n", groupTime) diff --git a/internal/app/wwctl/container/exec/main.go b/internal/app/wwctl/container/exec/main.go index 2e91a88c..4d405e91 100644 --- a/internal/app/wwctl/container/exec/main.go +++ b/internal/app/wwctl/container/exec/main.go @@ -51,14 +51,12 @@ func CobraRunE(cmd *cobra.Command, args []string) error { allargs = append(allargs, args...) containerPath := container.RootFsDir(containerName) - passwdTime := time.Now() fileStat, _ := os.Stat(path.Join(containerPath, "/etc/passwd")) unixStat := fileStat.Sys().(*syscall.Stat_t) - passwdTime = time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)) - groupTime := time.Now() + passwdTime := time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)) fileStat, _ = os.Stat(path.Join(containerPath, "/etc/group")) unixStat = fileStat.Sys().(*syscall.Stat_t) - groupTime = time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)) + groupTime := time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)) wwlog.Printf(wwlog.DEBUG, "passwd: %v\n", passwdTime) wwlog.Printf(wwlog.DEBUG, "group: %v\n", groupTime) From 26244a4dcb8f012c3f20020d0798700b752cfe80 Mon Sep 17 00:00:00 2001 From: MatthewHink Date: Wed, 6 Apr 2022 15:45:12 -0400 Subject: [PATCH 3/5] golang-lintci v.1.45.2 + fix yaml syntax --- .github/workflows/lint.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 5571cc32..ef2d5091 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: # Pin go version to the one(s) below. - go ['1.17'] + go: [ '1.17' ] steps: - uses: actions/checkout@v2 - - name Setup go ${{ matrix.go }} + - name: Setup go ${{ matrix.go }} uses: actions/setup.go@v2 with: go-version: ${{ matrix.go }} @@ -24,7 +24,7 @@ jobs: - name: Lint uses: golangci/golangci-lint-action@v2 with: - version: v1.31 + version: v1.45.2 skip-build-cache: true skip-pkg-cache: true args: --build-tags "containers_image_openpgp containers_image_ostree" --timeout 5m --skip-dirs internal/pkg/staticfiles From f3719845fb67d0ec2cae4060e11679e13771a8f8 Mon Sep 17 00:00:00 2001 From: MatthewHink Date: Wed, 6 Apr 2022 15:48:17 -0400 Subject: [PATCH 4/5] fix action name --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index ef2d5091..73cac021 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup go ${{ matrix.go }} - uses: actions/setup.go@v2 + uses: actions/setup-go@v2 with: go-version: ${{ matrix.go }} From d52f38c0262cc670450174015cbc49337dcd67e7 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 7 Apr 2022 11:50:01 +0200 Subject: [PATCH 5/5] Added Contributors closes #268 --- CONTRIBUTORS.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 00000000..dad95d3d --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,20 @@ +Gregory Kurtzer @gmk +Christian Goll @mslacken +Niko Kivel @kivel +Jeremy Siadal @jcsiadal +Shannon V. Davidson +Brian Clemens @brianclemens +Michael L. Young @ajyounge +Ian Kaneshiro @ikaneshiro +MatthewHink @MatthewHink +WestleyR @WestleyK +Michael L. Young +Yong Qin +Yoshiaki SENDA +Cooper, Trevor +Masahiko OHKUBO +John Hanks @griznog +Rob Jansen +svdavidson +David McFarlane <54093156+Prepultrue@users.noreply.github.com> +TerranWorks