E2E tests use repeated strings for test data where constants add no value (#97)

---------

Co-authored-by: Pasha Sviderski <[email protected]>
Co-authored-by: Anton Ovchinnikov <[email protected]>

Author: 3 people

.github/workflows/lint.yml

@@ -25,15 +25,15 @@ jobs:
         with:
           go-version: "1.23.2"
 
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
+        with:
+          version: v2.2.2
+
       - name: Format code
         run: |
           make format
           git diff --exit-code ||
             (echo "Code is not formatted. Please run 'make format' and commit the changes." && exit 1)
 
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
-        with:
-          version: v2.2.2
-
     timeout-minutes: 10

.golangci.yaml

@@ -1,4 +1,10 @@
 version: "2"
+
+run:
+  concurrency: 4
+  tests: true
+  timeout: 5m
+
 linters:
   default: none
   enable:
@@ -23,8 +29,14 @@ linters:
     # - unparam
     # - unused
     - whitespace
+  exclusions:
+    rules:
+      - path: ^test/e2e
+        linters:
+          - goconst  # constants here add no value, so we skip goconst only for test/e2e.
 
 formatters:
   enable:
-    - gofmt
-    # - goimports
+    - gofumpt
+    - goimports
+

Makefile

@@ -89,17 +89,19 @@ test-clean:
 vet:
 	go vet ./...
 
-.PHONY: format
-format:
-	go fmt ./...
+.PHONY: format fmt
+format fmt:
+	GOOS=linux golangci-lint fmt
 
 LINT_TARGETS := lint lint-and-fix
 .PHONY: $(LINT_TARGETS) _lint
 $(LINT_TARGETS): _lint
 lint: ARGS=
 lint-and-fix: ARGS=--fix
 _lint:
-	golangci-lint run $(ARGS)
+	# Explicitly set OS to Linux to not skip *_linux.go files when running on macOS.
+	# Uncloud daemon won't likely support OS other than Linux anytime soon, so for now we can rely on that.
+	GOOS=linux golangci-lint run $(ARGS)
 
 .PHONY: docs-image-push
 docs-image-push:

cmd/ucind/cluster/create.go

@@ -2,6 +2,7 @@ package cluster
 
 import (
 	"fmt"
+
 	"github.com/psviderski/uncloud/internal/ucind"
 	"github.com/spf13/cobra"
 )

cmd/ucind/cluster/remove.go

@@ -2,6 +2,7 @@ package cluster
 
 import (
 	"fmt"
+
 	"github.com/psviderski/uncloud/internal/ucind"
 	"github.com/spf13/cobra"
 )

cmd/ucind/cluster/root.go

@@ -13,7 +13,7 @@ func NewRootCommand() *cobra.Command {
 	}
 	cmd.AddCommand(
 		NewCreateCommand(),
-		//NewListCommand(),
+		// NewListCommand(),
 		NewRemoveCommand(),
 	)
 	return cmd

cmd/uncloud/machine/rm.go

@@ -101,7 +101,6 @@ func remove(ctx context.Context, uncli *cli.CLI, machineName string, opts remove
 		err = progress.RunWithTitle(ctx, func(ctx context.Context) error {
 			return removeContainers(ctx, client, containers)
 		}, uncli.ProgressOut(), "Removing containers")
-
 		if err != nil {
 			return fmt.Errorf("remove containers: %w", err)
 		}
@@ -112,8 +111,8 @@ func remove(ctx context.Context, uncli *cli.CLI, machineName string, opts remove
 	// TODO: 5. Remove the machine from the cluster store.
 
 	return fmt.Errorf("resetting machine is not fully implemented yet")
-	//fmt.Printf("Machine '%s' removed from the cluster.\n", m.Name)
-	//return nil
+	// fmt.Printf("Machine '%s' removed from the cluster.\n", m.Name)
+	// return nil
 }
 
 // formatContainerTree formats a list of containers grouped by service as a tree structure.

cmd/uncloud/machine/token.go

@@ -2,6 +2,7 @@ package machine
 
 import (
 	"fmt"
+
 	"github.com/psviderski/uncloud/internal/daemon"
 	"github.com/psviderski/uncloud/internal/machine"
 	"github.com/spf13/cobra"

cmd/uncloud/service/inspect.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/go-units"
-
 	"github.com/psviderski/uncloud/internal/cli"
 	"github.com/spf13/cobra"
 )

experiment/broadcaster.go

@@ -3,10 +3,11 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/hashicorp/serf/serf"
-	crdt "github.com/ipfs/go-ds-crdt"
 	"log/slog"
 	"time"
+
+	"github.com/hashicorp/serf/serf"
+	crdt "github.com/ipfs/go-ds-crdt"
 )
 
 // Implements the Broadcaster interface.