move internals

NETWAYS · Dec 20, 2023 · daf788c · daf788c
1 parent fe33988
commit daf788c
Show file tree

Hide file tree

Showing 65 changed files with 72 additions and 72 deletions.
diff --git a/pkg/collection/collection.go → internal/collection/collection.go b/pkg/collection/collection.go → internal/collection/collection.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 )

diff --git a/pkg/collection/collection_test.go → internal/collection/collection_test.go b/pkg/collection/collection_test.go → internal/collection/collection_test.go
diff --git a/pkg/collection/exec.go → internal/collection/exec.go b/pkg/collection/exec.go → internal/collection/exec.go
diff --git a/pkg/collection/exec_test.go → internal/collection/exec_test.go b/pkg/collection/exec_test.go → internal/collection/exec_test.go
diff --git a/pkg/collection/file.go → internal/collection/file.go b/pkg/collection/file.go → internal/collection/file.go
diff --git a/pkg/collection/file_test.go → internal/collection/file_test.go b/pkg/collection/file_test.go → internal/collection/file_test.go
diff --git a/pkg/collection/git.go → internal/collection/git.go b/pkg/collection/git.go → internal/collection/git.go
diff --git a/pkg/collection/git_test.go → internal/collection/git_test.go b/pkg/collection/git_test.go → internal/collection/git_test.go
diff --git a/pkg/collection/packages.go → internal/collection/packages.go b/pkg/collection/packages.go → internal/collection/packages.go
diff --git a/pkg/collection/processes.go → internal/collection/processes.go b/pkg/collection/processes.go → internal/collection/processes.go
diff --git a/pkg/collection/services.go → internal/collection/services.go b/pkg/collection/services.go → internal/collection/services.go
diff --git a/pkg/collection/testdata/example.txt → internal/collection/testdata/example.txt b/pkg/collection/testdata/example.txt → internal/collection/testdata/example.txt
diff --git a/pkg/collection/testdata/recursive/test.txt → ...al/collection/testdata/recursive/test.txt b/pkg/collection/testdata/recursive/test.txt → ...al/collection/testdata/recursive/test.txt
diff --git a/pkg/obfuscate/obfuscate.go → internal/obfuscate/obfuscate.go b/pkg/obfuscate/obfuscate.go → internal/obfuscate/obfuscate.go
diff --git a/pkg/obfuscate/obfuscate_test.go → internal/obfuscate/obfuscate_test.go b/pkg/obfuscate/obfuscate_test.go → internal/obfuscate/obfuscate_test.go
diff --git a/pkg/obfuscate/regexp.go → internal/obfuscate/regexp.go b/pkg/obfuscate/regexp.go → internal/obfuscate/regexp.go
diff --git a/pkg/obfuscate/regexp_test.go → internal/obfuscate/regexp_test.go b/pkg/obfuscate/regexp_test.go → internal/obfuscate/regexp_test.go
diff --git a/pkg/util/log.go → internal/util/log.go b/pkg/util/log.go → internal/util/log.go
diff --git a/pkg/util/testdata/command.txt → internal/util/testdata/command.txt b/pkg/util/testdata/command.txt → internal/util/testdata/command.txt
diff --git a/pkg/util/testdata/command.txt.obfuscated → ...rnal/util/testdata/command.txt.obfuscated b/pkg/util/testdata/command.txt.obfuscated → ...rnal/util/testdata/command.txt.obfuscated
diff --git a/pkg/util/testdata/file/test.log → internal/util/testdata/file/test.log b/pkg/util/testdata/file/test.log → internal/util/testdata/file/test.log
diff --git a/pkg/util/testdata/file/test.log.obfuscated → ...al/util/testdata/file/test.log.obfuscated b/pkg/util/testdata/file/test.log.obfuscated → ...al/util/testdata/file/test.log.obfuscated
diff --git a/pkg/util/testing.go → internal/util/testing.go b/pkg/util/testing.go → internal/util/testing.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/util/testing_test.go → internal/util/testing_test.go b/pkg/util/testing_test.go → internal/util/testing_test.go
@@ -3,7 +3,7 @@ package util
 import (
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/util/util.go → internal/util/util.go b/pkg/util/util.go → internal/util/util.go
diff --git a/main.go b/main.go
@@ -7,6 +7,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/util"
 	"github.com/NETWAYS/support-collector/modules/ansible"
 	"github.com/NETWAYS/support-collector/modules/base"
 	"github.com/NETWAYS/support-collector/modules/corosync"
@@ -27,9 +30,6 @@ import (
 	"github.com/NETWAYS/support-collector/modules/prometheus"
 	"github.com/NETWAYS/support-collector/modules/puppet"
 	"github.com/NETWAYS/support-collector/modules/webservers"
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
-	"github.com/NETWAYS/support-collector/pkg/util"
 
 	"github.com/mattn/go-colorable"
 	"github.com/sirupsen/logrus"

diff --git a/modules/ansible/collector.go b/modules/ansible/collector.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 )
 
 const ModuleName = "ansible"

diff --git a/modules/ansible/collector_test.go b/modules/ansible/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/base/collector.go b/modules/base/collector.go
@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"gopkg.in/yaml.v3"
 )
 

diff --git a/modules/base/collector_test.go b/modules/base/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/corosync/collector.go b/modules/corosync/collector.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 )
 
 const ModuleName = "corosync"

diff --git a/modules/corosync/collector_test.go b/modules/corosync/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/elastic/collector.go b/modules/elastic/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const ModuleName = "elastic"

diff --git a/modules/elastic/collector_test.go b/modules/elastic/collector_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
-	"github.com/NETWAYS/support-collector/pkg/util"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/util"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/foreman/collector.go b/modules/foreman/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const ModuleName = "foreman"

diff --git a/modules/foreman/collector_test.go b/modules/foreman/collector_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
-	"github.com/NETWAYS/support-collector/pkg/util"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/util"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/grafana/collector.go b/modules/grafana/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const ModuleName = "grafana"

diff --git a/modules/grafana/collector_test.go b/modules/grafana/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/graphite/collector.go b/modules/graphite/collector.go
@@ -4,9 +4,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
-	"github.com/NETWAYS/support-collector/pkg/util"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/util"
 )
 
 const ModuleName = "graphite"

diff --git a/modules/graphite/collector_test.go b/modules/graphite/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/graylog/collector.go b/modules/graylog/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const ModuleName = "graylog"

diff --git a/modules/graylog/collector_test.go b/modules/graylog/collector_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
-	"github.com/NETWAYS/support-collector/pkg/util"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/util"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/icinga2/collector.go b/modules/icinga2/collector.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const ModuleName = "icinga2"

diff --git a/modules/icingadb/collector.go b/modules/icingadb/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const (

diff --git a/modules/icingadb/collector_test.go b/modules/icingadb/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/icingadirector/collector.go b/modules/icingadirector/collector.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 )
 
 const (

diff --git a/modules/icingadirector/collector_test.go b/modules/icingadirector/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/icingaweb2/collector.go b/modules/icingaweb2/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const (

diff --git a/modules/icingaweb2/collector_test.go b/modules/icingaweb2/collector_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
-	"github.com/NETWAYS/support-collector/pkg/util"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/util"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/influxdb/collector.go b/modules/influxdb/collector.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 )
 
 const ModuleName = "influxdb"

diff --git a/modules/influxdb/collector_test.go b/modules/influxdb/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/keepalived/collector.go b/modules/keepalived/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const ModuleName = "keepalived"

diff --git a/modules/keepalived/collector_test.go b/modules/keepalived/collector_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
-	"github.com/NETWAYS/support-collector/pkg/util"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/util"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/mongodb/collector.go b/modules/mongodb/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const ModuleName = "mongodb"

diff --git a/modules/mongodb/collector_test.go b/modules/mongodb/collector_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
-	"github.com/NETWAYS/support-collector/pkg/util"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/util"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/mysql/collector.go b/modules/mysql/collector.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
-	"github.com/NETWAYS/support-collector/pkg/obfuscate"
+	"github.com/NETWAYS/support-collector/internal/collection"
+	"github.com/NETWAYS/support-collector/internal/obfuscate"
 )
 
 const (

diff --git a/modules/mysql/collector_test.go b/modules/mysql/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/modules/postgresql/collector.go b/modules/postgresql/collector.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 )
 
 const ModuleName = "postgresql"

diff --git a/modules/postgresql/collector_test.go b/modules/postgresql/collector_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/NETWAYS/support-collector/pkg/collection"
+	"github.com/NETWAYS/support-collector/internal/collection"
 	"github.com/stretchr/testify/assert"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"os"
     	"path/filepath"
-    	"github.com/NETWAYS/support-collector/pkg/collection"
+    	"github.com/NETWAYS/support-collector/internal/collection"
     )
     const (
@@ Expand Down @@