fixup! lint in a container for consistency

Author: jshufro

.github/workflows/lint.yml

@@ -13,29 +13,41 @@ permissions:
   # Optional: allow read access to pull request. Use with `only-new-issues` option.
   # pull-requests: read
 jobs:
-  golangci:
+  detect-modules:
+    runs-on: ubuntu-latest
+    outputs:
+      modules: ${{ steps.set-modules.outputs.modules }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 1.21.8
+      - id: set-modules
+        run: "modules=$(go list -m -json | jq -s '.' | jq -c '[.[].Dir]')" >> $GITHUB_OUTPUT
+  golangci-lint:
+    needs: detect-modules
     name: lint
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        modules: ${{ fromJSON(needs.detect-modules.outputs.modules) }}}
     steps:
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.21.8
-      - uses: actions/checkout@v3
-      - name: golangci-lint
+      - name: golangci-lint ${{ matrix.modules }}
         uses: golangci/golangci-lint-action@v8
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: v2.1
 
           # Optional: working directory, useful for monorepos
-          # working-directory: somedir
+          working-directory: ${{ matrix.modules }}
 
           # Optional: golangci-lint command line arguments.
           # args: --issues-exit-code=0
 
-          # For now, Smart Node will only enforce goimports linting
-          args: --disable-all --enable goimports addons/... shared/... rocketpool/... rocketpool-cli/...
-
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
 

.golangci.yml

@@ -0,0 +1,12 @@
+version: "2"
+linters:
+  default: none 
+  formatters:
+    default: none
+    enable:
+      - goimports
+  run:
+    relative-path-mode: cfg
+    go: '1.21.8'
+output:
+  path: stderr

Makefile

@@ -12,7 +12,6 @@ CLI_TARGET_STRINGS:=$(foreach oos,$(CLI_TARGET_OOS), $(foreach arch,$(ARCHS),${C
 DAEMON_TARGET_STRINGS:=$(foreach arch,$(ARCHS),${DAEMON_DIR}/rocketpool-daemon-linux-$(arch))
 
 MODULES:=$(foreach path,$(shell find . -name go.mod),$(dir $(path)))
-MODULE_GLOBS:=$(foreach module,$(MODULES),$(module)...)
 
 define rocketpool-cli-template
 .PHONY: ${CLI_DIR}/rocketpool-cli-$1-$2
@@ -63,10 +62,14 @@ docker:
 	docker manifest create rocketpool/smartnode:${VERSION} --amend rocketpool/smartnode:${VERSION}-amd64 --amend rocketpool/smartnode:${VERSION}-arm64
 	docker manifest create rocketpool/smartnode:latest --amend rocketpool/smartnode:${VERSION}-amd64 --amend rocketpool/smartnode:${VERSION}-arm64
 
+define lint-template 
+.PHONY: lint-$1
+lint-$1:
+	docker run --rm -v .:/go/smartnode --workdir /go/smartnode/$1 golangci/golangci-lint:v2.1-alpine golangci-lint fmt --diff
+endef
+$(foreach module,$(MODULES),$(eval $(call lint-template,$(module))))
 .PHONY: lint
-lint:
-	@echo $(MODULE_GLOBS)
-	docker run --rm -v .:/go/smartnode --workdir /go/smartnode golangci/golangci-lint:v2.1-alpine golangci-lint fmt --enable goimports $(MODULE_GLOBS)
+lint: $(foreach module,$(MODULES),lint-$(module))
 
 .PHONY: test
 test:

addons/rescue_node/config.go

@@ -7,7 +7,7 @@ import (
 type RescueNodeConfig struct {
 	Title string `yaml:"-"`
 
-	Enabled config.Parameter `yaml:"enabled,omitempty"`
+  	Enabled config.Parameter `yaml:"enabled,omitempty"`
 
 	Username config.Parameter `yaml:"username,omitempty"`
 	Password config.Parameter `yaml:"username,omitempty"`