From 453e4d134599067f229f08673847a180f9351829 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Sun, 10 Aug 2025 16:21:16 -0400 Subject: [PATCH] More lint fixes - YAML & Go --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- cmd/agent/executeCheck.go | 7 ++++--- cmd/agent/executeCommand.go | 3 ++- cmd/agent/main.go | 7 ++++--- cmd/server/main.go | 7 ++++--- internal/analyzer/analyzer.go | 5 +++-- internal/config/types_test.go | 3 ++- internal/gitstore/store.go | 3 ++- internal/gitstore/store_test.go | 3 ++- internal/viewmodels/viewmodels.go | 3 ++- 13 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6a83094..2292361 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,4 +18,4 @@ updates: groups: actions: patterns: - - "*" \ No newline at end of file + - "*" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ad2602..37d7546 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,4 +33,4 @@ jobs: run: | make lint make test - make build \ No newline at end of file + make build diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ea2fbce..bfc7252 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -28,4 +28,4 @@ jobs: uses: github/codeql-action/autobuild@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1 - name: Analyze - uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1 \ No newline at end of file + uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 2ba1561..ca6d714 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -19,4 +19,4 @@ jobs: - name: Review Dependencies uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0 with: - fail-on-severity: critical \ No newline at end of file + fail-on-severity: critical diff --git a/cmd/agent/executeCheck.go b/cmd/agent/executeCheck.go index 16c00b9..ad02e3c 100644 --- a/cmd/agent/executeCheck.go +++ b/cmd/agent/executeCheck.go @@ -3,14 +3,15 @@ package main import ( "context" "fmt" - "gitmdm/internal/analyzer" - "gitmdm/internal/config" - "gitmdm/internal/gitmdm" "log" "os" "os/exec" "strings" "time" + + "github.com/codeGROOVE-dev/gitMDM/internal/analyzer" + "github.com/codeGROOVE-dev/gitMDM/internal/config" + "github.com/codeGROOVE-dev/gitMDM/internal/gitmdm" ) // executeCheck executes a single check rule (command or file) and returns the output. diff --git a/cmd/agent/executeCommand.go b/cmd/agent/executeCommand.go index b475d57..0e5e59a 100644 --- a/cmd/agent/executeCommand.go +++ b/cmd/agent/executeCommand.go @@ -5,13 +5,14 @@ import ( "context" "errors" "fmt" - "gitmdm/internal/gitmdm" "log" "os" "os/exec" "runtime" "strings" "time" + + "github.com/codeGROOVE-dev/gitMDM/internal/gitmdm" ) // containsShellOperators checks if a command contains shell operators that indicate diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 3706099..cad051b 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -11,9 +11,6 @@ import ( "errors" "flag" "fmt" - "gitmdm/internal/analyzer" - "gitmdm/internal/config" - "gitmdm/internal/gitmdm" "io" "log" "math" @@ -31,6 +28,10 @@ import ( "syscall" "time" + "github.com/codeGROOVE-dev/gitMDM/internal/analyzer" + "github.com/codeGROOVE-dev/gitMDM/internal/config" + "github.com/codeGROOVE-dev/gitMDM/internal/gitmdm" + "github.com/codeGROOVE-dev/retry" "gopkg.in/yaml.v3" ) diff --git a/cmd/server/main.go b/cmd/server/main.go index ae74818..2111290 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -10,9 +10,6 @@ import ( "encoding/json" "flag" "fmt" - "gitmdm/internal/gitmdm" - "gitmdm/internal/gitstore" - "gitmdm/internal/viewmodels" "html/template" "io/fs" "log" @@ -27,6 +24,10 @@ import ( "syscall" "time" + "github.com/codeGROOVE-dev/gitMDM/internal/gitmdm" + "github.com/codeGROOVE-dev/gitMDM/internal/gitstore" + "github.com/codeGROOVE-dev/gitMDM/internal/viewmodels" + "github.com/codeGROOVE-dev/retry" ) diff --git a/internal/analyzer/analyzer.go b/internal/analyzer/analyzer.go index 4b0c43d..91564ae 100644 --- a/internal/analyzer/analyzer.go +++ b/internal/analyzer/analyzer.go @@ -3,12 +3,13 @@ package analyzer import ( "fmt" - "gitmdm/internal/config" - "gitmdm/internal/gitmdm" "log" "os" "regexp" "strings" + + "github.com/codeGROOVE-dev/gitMDM/internal/config" + "github.com/codeGROOVE-dev/gitMDM/internal/gitmdm" ) var debug = os.Getenv("DEBUG") == "true" diff --git a/internal/config/types_test.go b/internal/config/types_test.go index b97619c..2ac41d8 100644 --- a/internal/config/types_test.go +++ b/internal/config/types_test.go @@ -1,10 +1,11 @@ package config_test import ( - "gitmdm/internal/config" "os" "testing" + "github.com/codeGROOVE-dev/gitMDM/internal/config" + "gopkg.in/yaml.v3" ) diff --git a/internal/gitstore/store.go b/internal/gitstore/store.go index 1b371d7..d51f65a 100644 --- a/internal/gitstore/store.go +++ b/internal/gitstore/store.go @@ -9,7 +9,6 @@ import ( "encoding/json" "errors" "fmt" - "gitmdm/internal/gitmdm" "log" "os" "path/filepath" @@ -17,6 +16,8 @@ import ( "sync" "time" + "github.com/codeGROOVE-dev/gitMDM/internal/gitmdm" + "github.com/codeGROOVE-dev/retry" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" diff --git a/internal/gitstore/store_test.go b/internal/gitstore/store_test.go index 4337334..1112a7f 100644 --- a/internal/gitstore/store_test.go +++ b/internal/gitstore/store_test.go @@ -3,13 +3,14 @@ package gitstore import ( "context" "fmt" - "gitmdm/internal/gitmdm" "os" "os/exec" "path/filepath" "strings" "testing" "time" + + "github.com/codeGROOVE-dev/gitMDM/internal/gitmdm" ) func TestSanitizeID(t *testing.T) { diff --git a/internal/viewmodels/viewmodels.go b/internal/viewmodels/viewmodels.go index 5a64ce1..ece52da 100644 --- a/internal/viewmodels/viewmodels.go +++ b/internal/viewmodels/viewmodels.go @@ -2,12 +2,13 @@ package viewmodels import ( - "gitmdm/internal/gitmdm" "regexp" "sort" "strconv" "strings" "time" + + "github.com/codeGROOVE-dev/gitMDM/internal/gitmdm" ) const (