From 7c84241e80c2cd1d3707d44ee91901cb05b63428 Mon Sep 17 00:00:00 2001 From: Ravi Chamarthy Date: Fri, 27 Oct 2023 04:37:46 +0000 Subject: [PATCH] fix gofmt errors Signed-off-by: Ravi Chamarthy --- demo/misc.go | 2 +- linux/disk.go | 4 ++-- linux/disk_test.go | 2 +- linux/root_test.go | 4 ++-- linux/system.go | 2 +- linux/system_test.go | 2 +- linux/util.go | 2 +- linux/util_test.go | 2 +- mockos/system_test.go | 2 +- ptimg/main.go | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/demo/misc.go b/demo/misc.go index 52f6519..55e1bc4 100644 --- a/demo/misc.go +++ b/demo/misc.go @@ -6,10 +6,10 @@ import ( "path" "regexp" + "github.com/urfave/cli/v2" "machinerun.io/disko" "machinerun.io/disko/linux" "machinerun.io/disko/partid" - "github.com/urfave/cli/v2" ) const partitionName = "updown" diff --git a/linux/disk.go b/linux/disk.go index d90c072..215a665 100644 --- a/linux/disk.go +++ b/linux/disk.go @@ -14,11 +14,11 @@ import ( "syscall" "unicode/utf16" - "machinerun.io/disko" - "machinerun.io/disko/partid" "github.com/rekby/gpt" "github.com/rekby/mbr" "golang.org/x/sys/unix" + "machinerun.io/disko" + "machinerun.io/disko/partid" ) const ( diff --git a/linux/disk_test.go b/linux/disk_test.go index 6c5cef9..9d5d8ea 100644 --- a/linux/disk_test.go +++ b/linux/disk_test.go @@ -8,9 +8,9 @@ import ( "path" "testing" + "github.com/stretchr/testify/assert" "machinerun.io/disko" "machinerun.io/disko/partid" - "github.com/stretchr/testify/assert" ) //nolint:funlen diff --git a/linux/root_test.go b/linux/root_test.go index 2be7e73..9174650 100644 --- a/linux/root_test.go +++ b/linux/root_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" + "golang.org/x/sys/unix" "machinerun.io/disko" "machinerun.io/disko/linux" "machinerun.io/disko/partid" - "github.com/stretchr/testify/assert" - "golang.org/x/sys/unix" ) const MiB = 1024 * 1024 diff --git a/linux/system.go b/linux/system.go index 92b2099..1274135 100644 --- a/linux/system.go +++ b/linux/system.go @@ -10,9 +10,9 @@ import ( "strings" "syscall" + "golang.org/x/sys/unix" "machinerun.io/disko" "machinerun.io/disko/megaraid" - "golang.org/x/sys/unix" ) type linuxSystem struct { diff --git a/linux/system_test.go b/linux/system_test.go index e0cd18f..32ec885 100644 --- a/linux/system_test.go +++ b/linux/system_test.go @@ -7,9 +7,9 @@ import ( "path" "testing" + "github.com/stretchr/testify/assert" "machinerun.io/disko" "machinerun.io/disko/partid" - "github.com/stretchr/testify/assert" ) func TestGetDiskProperties(t *testing.T) { diff --git a/linux/util.go b/linux/util.go index c591d3b..e9b5e99 100644 --- a/linux/util.go +++ b/linux/util.go @@ -13,8 +13,8 @@ import ( "strings" "syscall" - "machinerun.io/disko" "github.com/pkg/errors" + "machinerun.io/disko" ) // GetUdevInfo return a UdevInfo for the device with kernel name kname. diff --git a/linux/util_test.go b/linux/util_test.go index b0f5d19..e2898ea 100644 --- a/linux/util_test.go +++ b/linux/util_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "machinerun.io/disko" "github.com/stretchr/testify/assert" + "machinerun.io/disko" ) func TestParseUdevInfo(t *testing.T) { diff --git a/mockos/system_test.go b/mockos/system_test.go index 829605c..5f53b40 100644 --- a/mockos/system_test.go +++ b/mockos/system_test.go @@ -3,10 +3,10 @@ package mockos_test import ( "testing" + . "github.com/smartystreets/goconvey/convey" "machinerun.io/disko" "machinerun.io/disko/mockos" "machinerun.io/disko/partid" - . "github.com/smartystreets/goconvey/convey" ) //nolint:funlen diff --git a/ptimg/main.go b/ptimg/main.go index 4fb5cfb..e3b2187 100644 --- a/ptimg/main.go +++ b/ptimg/main.go @@ -16,10 +16,10 @@ import ( "syscall" "time" + "github.com/urfave/cli/v2" "machinerun.io/disko" "machinerun.io/disko/linux" "machinerun.io/disko/partid" - "github.com/urfave/cli/v2" ) var version string