Merge branch 'collector_wip' into UDENG-5705-Ubuntu-Insights-Consent-…

…Manager

internal/collector/sysinfo/sysinfo.go

@@ -1,4 +1,4 @@
-// package sysinfo allows collecting "common" system information for all insight reports.
+// Package sysinfo allows collecting "common" system information for all insight reports.
 package sysinfo
 
 type options struct {

internal/collector/sysinfo/sysinfo_darwin.go

@@ -0,0 +1,9 @@
+package sysinfo
+
+func (s Manager) collectHardware() (HwInfo, error) {
+	return HwInfo{}, nil
+}
+
+func (s Manager) collectSoftware() (SwInfo, error) {
+	return SwInfo{}, nil
+}

internal/collector/sysinfo/sysinfo_linux.go

@@ -6,7 +6,6 @@ import (
 )
 
 func (s Manager) collectHardware() (hwInfo HwInfo, err error) {
-
 	// System vendor
 	d, err := os.ReadFile(filepath.Join(s.root, "sys/class/dmi/id/sys_vendor"))
 	if err != nil {
@@ -20,6 +19,5 @@ func (s Manager) collectHardware() (hwInfo HwInfo, err error) {
 }
 
 func (s Manager) collectSoftware() (swInfo SwInfo, err error) {
-
 	return swInfo, nil
 }

internal/collector/sysinfo/sysinfo_linux_test.go

@@ -16,7 +16,7 @@ func TestNew(t *testing.T) {
 	}{
 		"Instantiate a sys info manager": {},
 	}
-	for name, _ := range tests {
+	for name := range tests {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
@@ -56,5 +56,4 @@ func TestCollect(t *testing.T) {
 			require.Equal(t, want, got, "Collect should return expected sys information")
 		})
 	}
-
 }

internal/collector/sysinfo/sysinfo_windows.go

@@ -0,0 +1,9 @@
+package sysinfo
+
+func (s Manager) collectHardware() (HwInfo, error) {
+	return HwInfo{}, nil
+}
+
+func (s Manager) collectSoftware() (SwInfo, error) {
+	return SwInfo{}, nil
+}