Sfoglia il codice sorgente

pkg/parsers: format code with gofumpt

Formatting the code with https://github.com/mvdan/gofumpt

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 3 anni fa
parent
commit
316c7331eb

+ 1 - 3
pkg/parsers/kernel/kernel_unix_test.go

@@ -8,9 +8,7 @@ import (
 )
 )
 
 
 func assertParseRelease(t *testing.T, release string, b *VersionInfo, result int) {
 func assertParseRelease(t *testing.T, release string, b *VersionInfo, result int) {
-	var (
-		a *VersionInfo
-	)
+	var a *VersionInfo
 	a, _ = ParseRelease(release)
 	a, _ = ParseRelease(release)
 
 
 	if r := CompareKernelVersion(*a, *b); r != result {
 	if r := CompareKernelVersion(*a, *b); r != result {

+ 0 - 1
pkg/parsers/kernel/kernel_windows.go

@@ -21,7 +21,6 @@ func (k *VersionInfo) String() string {
 
 
 // GetKernelVersion gets the current kernel version.
 // GetKernelVersion gets the current kernel version.
 func GetKernelVersion() (*VersionInfo, error) {
 func GetKernelVersion() (*VersionInfo, error) {
-
 	KVI := &VersionInfo{"Unknown", 0, 0, 0}
 	KVI := &VersionInfo{"Unknown", 0, 0, 0}
 
 
 	k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
 	k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)

+ 9 - 9
pkg/parsers/operatingsystem/operatingsystem_linux_test.go

@@ -126,7 +126,7 @@ VERSION_ID=18.04`,
 }
 }
 
 
 func runEtcReleaseParsingTests(t *testing.T, tests []EtcReleaseParsingTest, parsingFunc func() (string, error)) {
 func runEtcReleaseParsingTests(t *testing.T, tests []EtcReleaseParsingTest, parsingFunc func() (string, error)) {
-	var backup = etcOsRelease
+	backup := etcOsRelease
 
 
 	dir := os.TempDir()
 	dir := os.TempDir()
 	etcOsRelease = filepath.Join(dir, "etcOsRelease")
 	etcOsRelease = filepath.Join(dir, "etcOsRelease")
@@ -138,7 +138,7 @@ func runEtcReleaseParsingTests(t *testing.T, tests []EtcReleaseParsingTest, pars
 
 
 	for _, test := range tests {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
-			if err := os.WriteFile(etcOsRelease, []byte(test.content), 0600); err != nil {
+			if err := os.WriteFile(etcOsRelease, []byte(test.content), 0o600); err != nil {
 				t.Fatalf("failed to write to %s: %v", etcOsRelease, err)
 				t.Fatalf("failed to write to %s: %v", etcOsRelease, err)
 			}
 			}
 			s, err := parsingFunc()
 			s, err := parsingFunc()
@@ -201,7 +201,7 @@ func TestIsContainerized(t *testing.T) {
 		proc1Cgroup = backup
 		proc1Cgroup = backup
 	}()
 	}()
 
 
-	if err := os.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroup, 0600); err != nil {
+	if err := os.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroup, 0o600); err != nil {
 		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
 		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
 	}
 	}
 	inContainer, err := IsContainerized()
 	inContainer, err := IsContainerized()
@@ -212,7 +212,7 @@ func TestIsContainerized(t *testing.T) {
 		t.Fatal("Wrongly assuming containerized")
 		t.Fatal("Wrongly assuming containerized")
 	}
 	}
 
 
-	if err := os.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroupsystemd226, 0600); err != nil {
+	if err := os.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroupsystemd226, 0o600); err != nil {
 		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
 		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
 	}
 	}
 	inContainer, err = IsContainerized()
 	inContainer, err = IsContainerized()
@@ -223,7 +223,7 @@ func TestIsContainerized(t *testing.T) {
 		t.Fatal("Wrongly assuming containerized for systemd /init.scope cgroup layout")
 		t.Fatal("Wrongly assuming containerized for systemd /init.scope cgroup layout")
 	}
 	}
 
 
-	if err := os.WriteFile(proc1Cgroup, nonContainerizedProc1CgroupNotSystemd, 0600); err != nil {
+	if err := os.WriteFile(proc1Cgroup, nonContainerizedProc1CgroupNotSystemd, 0o600); err != nil {
 		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
 		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
 	}
 	}
 	inContainer, err = IsContainerized()
 	inContainer, err = IsContainerized()
@@ -234,7 +234,7 @@ func TestIsContainerized(t *testing.T) {
 		t.Fatal("Wrongly assuming non-containerized")
 		t.Fatal("Wrongly assuming non-containerized")
 	}
 	}
 
 
-	if err := os.WriteFile(proc1Cgroup, containerizedProc1Cgroup, 0600); err != nil {
+	if err := os.WriteFile(proc1Cgroup, containerizedProc1Cgroup, 0o600); err != nil {
 		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
 		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
 	}
 	}
 	inContainer, err = IsContainerized()
 	inContainer, err = IsContainerized()
@@ -247,8 +247,8 @@ func TestIsContainerized(t *testing.T) {
 }
 }
 
 
 func TestOsReleaseFallback(t *testing.T) {
 func TestOsReleaseFallback(t *testing.T) {
-	var backup = etcOsRelease
-	var altBackup = altOsRelease
+	backup := etcOsRelease
+	altBackup := altOsRelease
 	dir := os.TempDir()
 	dir := os.TempDir()
 	etcOsRelease = filepath.Join(dir, "etcOsRelease")
 	etcOsRelease = filepath.Join(dir, "etcOsRelease")
 	altOsRelease = filepath.Join(dir, "altOsRelease")
 	altOsRelease = filepath.Join(dir, "altOsRelease")
@@ -266,7 +266,7 @@ HOME_URL="http://www.gentoo.org/"
 SUPPORT_URL="http://www.gentoo.org/main/en/support.xml"
 SUPPORT_URL="http://www.gentoo.org/main/en/support.xml"
 BUG_REPORT_URL="https://bugs.gentoo.org/"
 BUG_REPORT_URL="https://bugs.gentoo.org/"
 `
 `
-	if err := os.WriteFile(altOsRelease, []byte(content), 0600); err != nil {
+	if err := os.WriteFile(altOsRelease, []byte(content), 0o600); err != nil {
 		t.Fatalf("failed to write to %s: %v", etcOsRelease, err)
 		t.Fatalf("failed to write to %s: %v", etcOsRelease, err)
 	}
 	}
 	s, err := GetOperatingSystem()
 	s, err := GetOperatingSystem()