Refactor to improve styling and simplify the running of commands (#3)

* Refactor to improve styling and simplify the running of commands

* go version for CI

* golangci-lint-version

* remove pointless getter

Author: joshjennings98

.github/workflows/ci.yml

@@ -2,42 +2,42 @@ name: CI
 
 on:
   push:
-    branches: 
+    branches:
       - main
   pull_request:
-    branches: 
+    branches:
       - main
 
 jobs:
   lint:
     name: Linting
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with:
-        go-version: "1.22.2"
-    - name: Lint Server
-      uses: golangci/golangci-lint-action@v6
-      with:
-        working-directory: server
-        version: v1.58
-    - name: Lint CLI
-      uses: golangci/golangci-lint-action@v6
-      with:
-        working-directory: backend-demo
-        version: v1.58
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.4"
+      - name: Lint Server
+        uses: golangci/golangci-lint-action@v9
+        with:
+          working-directory: server
+          version: v2.6
+      - name: Lint CLI
+        uses: golangci/golangci-lint-action@v9
+        with:
+          working-directory: backend-demo
+          version: v2.6
 
   test:
     name: Run Go Tests
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with:
-        go-version: "1.22.2"
-    - name: Run tests
-      run: |
-        cd server
-        go mod tidy
-        go test ./... -cover -v
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.25.4"
+      - name: Run tests
+        run: |
+          cd server
+          go mod tidy
+          go test ./... -cover -v

.golangci.yaml

@@ -1,40 +1,55 @@
+version: "2"
 run:
-  timeout: 10m
-
-  # Run linters over integration tests
   build-tags:
     - integration
-
 linters:
-  disable-all: true # Disable defaults, then enable the ones we want
+  default: none
   enable:
+    - bodyclose
     - errcheck
-    - gosimple
+    - gocritic
+    - gosec
     - govet
     - ineffassign
-    - typecheck
-    - unused
-    - bodyclose
-    - stylecheck
-    - gosec
-    - goimports
-    - gci
     - revive
-    - gocritic
+    - staticcheck
     - unconvert
-
-linters-settings:
-  goimports:
-    local-prefixes: github.com/joshjennings98
-  gci:
-    sections:
-      - Standard
-      - Default
-      - Prefix(github.com/joshjennings98)
-  revive:
-    rules:
-      - name: exported
-        severity: warning
-        disabled: false
-        arguments:
-          - "disableStutteringCheck"
+    - unused
+  settings:
+    revive:
+      rules:
+        - name: exported
+          arguments:
+            - disableStutteringCheck
+          severity: warning
+          disabled: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - goimports
+  settings:
+    gci:
+      sections:
+        - Standard
+        - Default
+        - Prefix(github.com/joshjennings98)
+    goimports:
+      local-prefixes:
+        - github.com/joshjennings98
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

backend-demo/cmd/root.go

@@ -12,11 +12,17 @@ import (
 	"github.com/joshjennings98/backend-demo/server/v2/server"
 )
 
-var commandFile string
+var (
+	commandFile string
+	port        int
+)
 
 func init() {
 	rootCmd.PersistentFlags().StringVarP(&commandFile, "command", "c", "", "Command file to use the presentation")
+	rootCmd.PersistentFlags().IntVarP(&port, "port", "p", 8080, "Port to run server on")
+
 	_ = viper.BindPFlag("command", rootCmd.PersistentFlags().Lookup("command"))
+	_ = viper.BindPFlag("port", rootCmd.PersistentFlags().Lookup("port"))
 }
 
 var rootCmd = &cobra.Command{
@@ -31,7 +37,7 @@ var rootCmd = &cobra.Command{
 
 		logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
 
-		s, err := server.NewServer(logger, commandFile)
+		s, err := server.NewServer(logger, port, commandFile)
 		if err != nil {
 			return
 		}

backend-demo/go.mod

@@ -1,6 +1,8 @@
 module github.com/joshjennings98/backend-demo/backend-demo/v2
 
-go 1.22.2
+go 1.25.4
+
+replace github.com/joshjennings98/backend-demo/server/v2 => ../server
 
 require (
 	github.com/joshjennings98/backend-demo/server/v2 v2.1.1

server/go.mod

@@ -1,6 +1,8 @@
 module github.com/joshjennings98/backend-demo/server/v2
 
-go 1.22
+go 1.25.4
+
+tool go.uber.org/mock/mockgen
 
 require (
 	github.com/gorilla/websocket v1.5.1
@@ -14,6 +16,9 @@ require (
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/mod v0.11.0 // indirect
 	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/tools v0.2.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

server/go.sum

@@ -14,8 +14,14 @@ github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
+golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
+golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=