From a5bb232af278fb6539501b4c1e1cf2c9c2ae990a Mon Sep 17 00:00:00 2001 From: Michael Hohn Date: Fri, 13 Dec 2024 10:54:35 -0800 Subject: [PATCH] Use full repository path name in place of mrvacommander --- cmd/agent/main.go | 4 ++-- cmd/server/main.go | 16 ++++++++-------- go.mod | 2 +- go.sum | 4 ---- pkg/agent/agent.go | 12 ++++++------ pkg/agent/interfaces.go | 6 +++--- pkg/artifactstore/common.go | 2 +- pkg/artifactstore/interfaces.go | 2 +- pkg/artifactstore/store_memory.go | 2 +- pkg/artifactstore/store_minio.go | 2 +- pkg/codeql/codeql.go | 4 ++-- pkg/deploy/init.go | 6 +++--- pkg/qldbstore/interfaces.go | 2 +- pkg/qldbstore/qldbstore_local.go | 2 +- pkg/qldbstore/qldbstore_minio.go | 2 +- pkg/queue/types.go | 4 ++-- pkg/server/server.go | 8 ++++---- pkg/server/types.go | 10 +++++----- pkg/state/interfaces.go | 4 ++-- pkg/state/state_local.go | 4 ++-- 20 files changed, 47 insertions(+), 51 deletions(-) diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 99bbb42..b6efcd4 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -10,8 +10,8 @@ import ( "sync" "syscall" - "mrvacommander/pkg/agent" - "mrvacommander/pkg/deploy" + "github.com/hohn/mrvacommander/pkg/agent" + "github.com/hohn/mrvacommander/pkg/deploy" ) func main() { diff --git a/cmd/server/main.go b/cmd/server/main.go index 8641c84..42f5b68 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -14,15 +14,15 @@ import ( "sync" "syscall" - "mrvacommander/config/mcc" + "github.com/hohn/mrvacommander/config/mcc" - "mrvacommander/pkg/agent" - "mrvacommander/pkg/artifactstore" - "mrvacommander/pkg/deploy" - "mrvacommander/pkg/qldbstore" - "mrvacommander/pkg/queue" - "mrvacommander/pkg/server" - "mrvacommander/pkg/state" + "github.com/hohn/mrvacommander/pkg/agent" + "github.com/hohn/mrvacommander/pkg/artifactstore" + "github.com/hohn/mrvacommander/pkg/deploy" + "github.com/hohn/mrvacommander/pkg/qldbstore" + "github.com/hohn/mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/pkg/server" + "github.com/hohn/mrvacommander/pkg/state" ) func main() { diff --git a/go.mod b/go.mod index ccc097c..d200f65 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module mrvacommander +module github.com/hohn/mrvacommander go 1.22.0 diff --git a/go.sum b/go.sum index 6ae537e..bff5962 100644 --- a/go.sum +++ b/go.sum @@ -66,14 +66,10 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go index ac2a83e..9b31c22 100644 --- a/pkg/agent/agent.go +++ b/pkg/agent/agent.go @@ -4,12 +4,12 @@ import ( "context" "fmt" "log/slog" - "mrvacommander/pkg/artifactstore" - "mrvacommander/pkg/codeql" - "mrvacommander/pkg/common" - "mrvacommander/pkg/qldbstore" - "mrvacommander/pkg/queue" - "mrvacommander/utils" + "github.com/hohn/mrvacommander/pkg/artifactstore" + "github.com/hohn/mrvacommander/pkg/codeql" + "github.com/hohn/mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/qldbstore" + "github.com/hohn/mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/utils" "os" "path/filepath" "runtime" diff --git a/pkg/agent/interfaces.go b/pkg/agent/interfaces.go index b10987b..974a78b 100644 --- a/pkg/agent/interfaces.go +++ b/pkg/agent/interfaces.go @@ -1,9 +1,9 @@ package agent import ( - "mrvacommander/pkg/artifactstore" - "mrvacommander/pkg/qldbstore" - "mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/pkg/artifactstore" + "github.com/hohn/mrvacommander/pkg/qldbstore" + "github.com/hohn/mrvacommander/pkg/queue" ) type Visibles struct { diff --git a/pkg/artifactstore/common.go b/pkg/artifactstore/common.go index 2a3bd7a..7d45923 100644 --- a/pkg/artifactstore/common.go +++ b/pkg/artifactstore/common.go @@ -2,7 +2,7 @@ package artifactstore import ( "fmt" - "mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/common" ) // Restrict the keys / values for ArtifactLocation and centralize the common ones diff --git a/pkg/artifactstore/interfaces.go b/pkg/artifactstore/interfaces.go index a4aea26..178f8f8 100644 --- a/pkg/artifactstore/interfaces.go +++ b/pkg/artifactstore/interfaces.go @@ -1,6 +1,6 @@ package artifactstore -import "mrvacommander/pkg/common" +import "github.com/hohn/mrvacommander/pkg/common" type Store interface { // GetQueryPack retrieves the query pack from the specified location. diff --git a/pkg/artifactstore/store_memory.go b/pkg/artifactstore/store_memory.go index f174280..ba15477 100644 --- a/pkg/artifactstore/store_memory.go +++ b/pkg/artifactstore/store_memory.go @@ -2,7 +2,7 @@ package artifactstore import ( "fmt" - "mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/common" "sync" ) diff --git a/pkg/artifactstore/store_minio.go b/pkg/artifactstore/store_minio.go index dff34ad..7cd4aba 100644 --- a/pkg/artifactstore/store_minio.go +++ b/pkg/artifactstore/store_minio.go @@ -7,7 +7,7 @@ import ( "io" "log/slog" "math" - "mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/common" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/pkg/codeql/codeql.go b/pkg/codeql/codeql.go index 3dc9c35..cba31e1 100644 --- a/pkg/codeql/codeql.go +++ b/pkg/codeql/codeql.go @@ -9,8 +9,8 @@ import ( "io" "log" "log/slog" - "mrvacommander/pkg/queue" - "mrvacommander/utils" + "github.com/hohn/mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/utils" "os" "os/exec" "os/signal" diff --git a/pkg/deploy/init.go b/pkg/deploy/init.go index 3834935..26bbe09 100644 --- a/pkg/deploy/init.go +++ b/pkg/deploy/init.go @@ -4,9 +4,9 @@ import ( "fmt" "log" "log/slog" - "mrvacommander/pkg/artifactstore" - "mrvacommander/pkg/qldbstore" - "mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/pkg/artifactstore" + "github.com/hohn/mrvacommander/pkg/qldbstore" + "github.com/hohn/mrvacommander/pkg/queue" "os" "strconv" ) diff --git a/pkg/qldbstore/interfaces.go b/pkg/qldbstore/interfaces.go index db239d3..06654a2 100644 --- a/pkg/qldbstore/interfaces.go +++ b/pkg/qldbstore/interfaces.go @@ -1,7 +1,7 @@ package qldbstore import ( - "mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/common" ) type Store interface { diff --git a/pkg/qldbstore/qldbstore_local.go b/pkg/qldbstore/qldbstore_local.go index 4368de8..509f31b 100644 --- a/pkg/qldbstore/qldbstore_local.go +++ b/pkg/qldbstore/qldbstore_local.go @@ -2,7 +2,7 @@ package qldbstore import ( "fmt" - "mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/common" "os" "path/filepath" ) diff --git a/pkg/qldbstore/qldbstore_minio.go b/pkg/qldbstore/qldbstore_minio.go index 0045610..6c328de 100644 --- a/pkg/qldbstore/qldbstore_minio.go +++ b/pkg/qldbstore/qldbstore_minio.go @@ -5,7 +5,7 @@ import ( "fmt" "io" "log/slog" - "mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/common" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/pkg/queue/types.go b/pkg/queue/types.go index f00cd2f..82f4e63 100644 --- a/pkg/queue/types.go +++ b/pkg/queue/types.go @@ -1,8 +1,8 @@ package queue import ( - "mrvacommander/pkg/artifactstore" - "mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/artifactstore" + "github.com/hohn/mrvacommander/pkg/common" ) type QueryLanguage string diff --git a/pkg/server/server.go b/pkg/server/server.go index 25a49c8..c201ec5 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "mrvacommander/pkg/artifactstore" - "mrvacommander/pkg/common" - "mrvacommander/pkg/queue" - "mrvacommander/utils" + "github.com/hohn/mrvacommander/pkg/artifactstore" + "github.com/hohn/mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/utils" "github.com/gorilla/mux" ) diff --git a/pkg/server/types.go b/pkg/server/types.go index 852b060..b70c98f 100644 --- a/pkg/server/types.go +++ b/pkg/server/types.go @@ -1,11 +1,11 @@ package server import ( - "mrvacommander/pkg/artifactstore" - "mrvacommander/pkg/common" - "mrvacommander/pkg/qldbstore" - "mrvacommander/pkg/queue" - "mrvacommander/pkg/state" + "github.com/hohn/mrvacommander/pkg/artifactstore" + "github.com/hohn/mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/qldbstore" + "github.com/hohn/mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/pkg/state" ) type SessionInfo struct { diff --git a/pkg/state/interfaces.go b/pkg/state/interfaces.go index 5fdff80..a2493ac 100644 --- a/pkg/state/interfaces.go +++ b/pkg/state/interfaces.go @@ -1,8 +1,8 @@ package state import ( - "mrvacommander/pkg/common" - "mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/queue" ) // StorageInterface defines the methods required for managing storage operations diff --git a/pkg/state/state_local.go b/pkg/state/state_local.go index 7a177a3..7bbade2 100644 --- a/pkg/state/state_local.go +++ b/pkg/state/state_local.go @@ -3,8 +3,8 @@ package state import ( "fmt" "log/slog" - "mrvacommander/pkg/common" - "mrvacommander/pkg/queue" + "github.com/hohn/mrvacommander/pkg/common" + "github.com/hohn/mrvacommander/pkg/queue" "sync" )