From e19af0ce0c5704a6858c1899f05c693d2731d2e9 Mon Sep 17 00:00:00 2001
From: "David J. Allen" <davidallendj@gmail.com>
Date: Thu, 20 Feb 2025 17:09:21 -0700
Subject: [PATCH] refactor: moved internal functions to pkg and updated refs

---
 cmd/collect.go                  | 4 ++++
 cmd/scan.go                     | 4 ++--
 cmd/update.go                   | 4 ++--
 internal/cache/sqlite/sqlite.go | 4 ++--
 {internal => pkg}/collect.go    | 0
 {internal => pkg}/scan.go       | 0
 {internal => pkg}/update.go     | 0
 tests/api_test.go               | 6 +++---
 8 files changed, 13 insertions(+), 9 deletions(-)
 rename {internal => pkg}/collect.go (100%)
 rename {internal => pkg}/scan.go (100%)
 rename {internal => pkg}/update.go (100%)

diff --git a/cmd/collect.go b/cmd/collect.go
index 53807c3..6d8934e 100644
--- a/cmd/collect.go
+++ b/cmd/collect.go
@@ -4,6 +4,10 @@ import (
 	"fmt"
 	"os/user"
 
+	"github.com/OpenCHAMI/magellan/internal/cache/sqlite"
+	urlx "github.com/OpenCHAMI/magellan/internal/url"
+	magellan "github.com/OpenCHAMI/magellan/pkg"
+	"github.com/OpenCHAMI/magellan/pkg/auth"
 	"github.com/cznic/mathutil"
 	magellan "github.com/davidallendj/magellan/internal"
 	"github.com/davidallendj/magellan/internal/cache/sqlite"
diff --git a/cmd/scan.go b/cmd/scan.go
index d2cbaf8..261fad7 100644
--- a/cmd/scan.go
+++ b/cmd/scan.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path"
 
-	magellan "github.com/davidallendj/magellan/internal"
-	"github.com/davidallendj/magellan/internal/cache/sqlite"
+	"github.com/OpenCHAMI/magellan/internal/cache/sqlite"
+	magellan "github.com/OpenCHAMI/magellan/pkg"
 	"github.com/rs/zerolog/log"
 
 	"github.com/cznic/mathutil"
diff --git a/cmd/update.go b/cmd/update.go
index b8fe150..83671e4 100644
--- a/cmd/update.go
+++ b/cmd/update.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	magellan "github.com/davidallendj/magellan/internal"
+	magellan "github.com/OpenCHAMI/magellan/pkg"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -99,5 +99,5 @@ func init() {
 	checkBindFlagError(viper.BindPFlag("update.status", updateCmd.Flags().Lookup("status")))
 	checkBindFlagError(viper.BindPFlag("update.insecure", updateCmd.Flags().Lookup("insecure")))
 
-	rootCmd.AddCommand(UpdateCmd)
+	rootCmd.AddCommand(updateCmd)
 }
diff --git a/internal/cache/sqlite/sqlite.go b/internal/cache/sqlite/sqlite.go
index 896ba1a..12fc2bb 100644
--- a/internal/cache/sqlite/sqlite.go
+++ b/internal/cache/sqlite/sqlite.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	magellan "github.com/davidallendj/magellan/internal"
-	"github.com/davidallendj/magellan/internal/util"
+	"github.com/OpenCHAMI/magellan/internal/util"
+	magellan "github.com/OpenCHAMI/magellan/pkg"
 
 	"github.com/jmoiron/sqlx"
 )
diff --git a/internal/collect.go b/pkg/collect.go
similarity index 100%
rename from internal/collect.go
rename to pkg/collect.go
diff --git a/internal/scan.go b/pkg/scan.go
similarity index 100%
rename from internal/scan.go
rename to pkg/scan.go
diff --git a/internal/update.go b/pkg/update.go
similarity index 100%
rename from internal/update.go
rename to pkg/update.go
diff --git a/tests/api_test.go b/tests/api_test.go
index d46a312..999f142 100644
--- a/tests/api_test.go
+++ b/tests/api_test.go
@@ -22,9 +22,9 @@ import (
 
 	"flag"
 
-	magellan "github.com/davidallendj/magellan/internal"
-	"github.com/davidallendj/magellan/internal/util"
-	"github.com/davidallendj/magellan/pkg/client"
+	"github.com/OpenCHAMI/magellan/internal/util"
+	magellan "github.com/OpenCHAMI/magellan/pkg"
+	"github.com/OpenCHAMI/magellan/pkg/client"
 	"github.com/rs/zerolog/log"
 )