Make "Local Machine" dataLoader name more sensible

lkarlslund · Nov 26, 2024 · f3fd3ff · f3fd3ff
1 parent 7920968
commit f3fd3ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/modules/integrations/localmachine/analyze/loader.go b/modules/integrations/localmachine/analyze/loader.go
@@ -1,17 +1,18 @@
 package analyze
 
 import (
+	"os"
+	"runtime"
+	"strings"
+	"sync"
+
 	"github.com/lkarlslund/adalanche/modules/engine"
 	"github.com/lkarlslund/adalanche/modules/integrations/localmachine"
 	"github.com/lkarlslund/adalanche/modules/ui"
 	"github.com/mailru/easyjson"
-	"io/ioutil"
-	"runtime"
-	"strings"
-	"sync"
 )
 
-const loadername = "Local Machine JSON file"
+const Loadername = "Local Machine"
 
 var (
 	loader = engine.AddLoader(func() engine.Loader { return &LocalMachineLoader{} })
@@ -30,7 +31,7 @@ type LocalMachineLoader struct {
 }
 
 func (ld *LocalMachineLoader) Name() string {
-	return loadername
+	return Loadername
 }
 func (ld *LocalMachineLoader) Init() error {
 	ld.ao = engine.NewLoaderObjects(ld)
@@ -40,7 +41,7 @@ func (ld *LocalMachineLoader) Init() error {
 		ld.done.Add(1)
 		go func() {
 			for queueItem := range ld.infostoadd {
-				raw, err := ioutil.ReadFile(queueItem.path)
+				raw, err := os.ReadFile(queueItem.path)
 				if err != nil {
 					ui.Warn().Msgf("Problem reading data from JSON file %v: %v", queueItem, err)
 					continue

diff --git a/modules/integrations/localmachine/analyze/postprocessing.go b/modules/integrations/localmachine/analyze/postprocessing.go
@@ -48,7 +48,7 @@ func init() {
 
 	loader.AddProcessor(func(ao *engine.Objects) {
 		var warns int
-		ln := engine.NewAttributeValueString(loadername)
+		ln := engine.NewAttributeValueString(Loadername)
 		ao.Iterate(func(o *engine.Object) bool {
 			if o.HasAttrValue(engine.DataLoader, ln) {
 				if o.HasAttr(activedirectory.ObjectSid) {