From 2a9bae8e80d903b9af0a82bd8859be3f5e8a3bdb Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 12 Mar 2025 13:11:37 +0200 Subject: [PATCH] [no-relnotes] Update moq to use rm and goimports Signed-off-by: Evan Lezar --- internal/discover/discover.go | 2 +- internal/info/proc/devices/devices.go | 2 +- internal/ldcache/ldcache.go | 2 +- internal/lookup/locator.go | 2 +- internal/nvsandboxutils/gen/nvsandboxutils/generateapi.go | 2 +- internal/nvsandboxutils/lib.go | 2 +- internal/nvsandboxutils/mock/interface.go | 3 ++- internal/nvsandboxutils/zz_generated.api.go | 2 +- internal/oci/runtime.go | 2 +- internal/oci/spec.go | 2 +- internal/requirements/constraints/constraints.go | 2 +- internal/requirements/constraints/property.go | 2 +- internal/system/nvdevices/mknod.go | 2 +- internal/system/nvmodules/cmd.go | 2 +- pkg/nvcdi/namer.go | 2 +- 15 files changed, 16 insertions(+), 15 deletions(-) diff --git a/internal/discover/discover.go b/internal/discover/discover.go index 7ff9f042..fc639296 100644 --- a/internal/discover/discover.go +++ b/internal/discover/discover.go @@ -38,7 +38,7 @@ type Hook struct { // Discover defines an interface for discovering the devices, mounts, and hooks available on a system // -//go:generate moq -stub -out discover_mock.go . Discover +//go:generate moq -rm -fmt=goimports -stub -out discover_mock.go . Discover type Discover interface { Devices() ([]Device, error) Mounts() ([]Mount, error) diff --git a/internal/info/proc/devices/devices.go b/internal/info/proc/devices/devices.go index 5927c837..534a4afd 100644 --- a/internal/info/proc/devices/devices.go +++ b/internal/info/proc/devices/devices.go @@ -49,7 +49,7 @@ type Major int // Devices represents the set of devices under /proc/devices // -//go:generate moq -stub -out devices_mock.go . Devices +//go:generate moq -rm -fmt=goimports -stub -out devices_mock.go . Devices type Devices interface { Exists(Name) bool Get(Name) (Major, bool) diff --git a/internal/ldcache/ldcache.go b/internal/ldcache/ldcache.go index 4daf95bc..5e6ef056 100644 --- a/internal/ldcache/ldcache.go +++ b/internal/ldcache/ldcache.go @@ -79,7 +79,7 @@ type entry2 struct { // LDCache represents the interface for performing lookups into the LDCache // -//go:generate moq -rm -out ldcache_mock.go . LDCache +//go:generate moq -rm -fmt=goimports -out ldcache_mock.go . LDCache type LDCache interface { List() ([]string, []string) } diff --git a/internal/lookup/locator.go b/internal/lookup/locator.go index 73ade232..9906327c 100644 --- a/internal/lookup/locator.go +++ b/internal/lookup/locator.go @@ -18,7 +18,7 @@ package lookup import "errors" -//go:generate moq -stub -out locator_mock.go . Locator +//go:generate moq -rm -fmt=goimports -stub -out locator_mock.go . Locator // Locator defines the interface for locating files on a system. type Locator interface { diff --git a/internal/nvsandboxutils/gen/nvsandboxutils/generateapi.go b/internal/nvsandboxutils/gen/nvsandboxutils/generateapi.go index 104b824b..6eb1e500 100644 --- a/internal/nvsandboxutils/gen/nvsandboxutils/generateapi.go +++ b/internal/nvsandboxutils/gen/nvsandboxutils/generateapi.go @@ -167,7 +167,7 @@ func generateInterfaceComment(input GeneratableInterfacePoperties) (string, erro commentFmt := []string{ "// %s represents the interface for the %s type.", "//", - "//go:generate moq -out mock/%s.go -pkg mock . %s:%s", + "//go:generate moq -rm -fmt=goimports -out mock/%s.go -pkg mock . %s:%s", } var signature strings.Builder diff --git a/internal/nvsandboxutils/lib.go b/internal/nvsandboxutils/lib.go index 3a85ef89..2872e107 100644 --- a/internal/nvsandboxutils/lib.go +++ b/internal/nvsandboxutils/lib.go @@ -35,7 +35,7 @@ var errLibraryAlreadyLoaded = errors.New("library already loaded") // dynamicLibrary is an interface for abstacting the underlying library. // This also allows for mocking and testing. -//go:generate moq -rm -stub -out dynamicLibrary_mock.go . dynamicLibrary +//go:generate moq -rm -fmt=goimports -stub -out dynamicLibrary_mock.go . dynamicLibrary type dynamicLibrary interface { Lookup(string) error Open() error diff --git a/internal/nvsandboxutils/mock/interface.go b/internal/nvsandboxutils/mock/interface.go index d7b27ebf..53cfdc02 100644 --- a/internal/nvsandboxutils/mock/interface.go +++ b/internal/nvsandboxutils/mock/interface.go @@ -4,8 +4,9 @@ package mock import ( - "github.com/NVIDIA/nvidia-container-toolkit/internal/nvsandboxutils" "sync" + + "github.com/NVIDIA/nvidia-container-toolkit/internal/nvsandboxutils" ) // Ensure, that Interface does implement nvsandboxutils.Interface. diff --git a/internal/nvsandboxutils/zz_generated.api.go b/internal/nvsandboxutils/zz_generated.api.go index 1cc2b01a..631b2b05 100644 --- a/internal/nvsandboxutils/zz_generated.api.go +++ b/internal/nvsandboxutils/zz_generated.api.go @@ -31,7 +31,7 @@ var ( // Interface represents the interface for the library type. // -//go:generate moq -out mock/interface.go -pkg mock . Interface:Interface +//go:generate moq -rm -fmt=goimports -out mock/interface.go -pkg mock . Interface:Interface type Interface interface { ErrorString(Ret) string GetDriverVersion() (string, Ret) diff --git a/internal/oci/runtime.go b/internal/oci/runtime.go index 2ea71cb2..6039490d 100644 --- a/internal/oci/runtime.go +++ b/internal/oci/runtime.go @@ -19,7 +19,7 @@ package oci // Runtime is an interface for a runtime shim. The Exec method accepts a list // of command line arguments, and returns an error / nil. // -//go:generate moq -rm -stub -out runtime_mock.go . Runtime +//go:generate moq -rm -fmt=goimports -stub -out runtime_mock.go . Runtime type Runtime interface { Exec([]string) error String() string diff --git a/internal/oci/spec.go b/internal/oci/spec.go index e95ea1cf..11cac3e7 100644 --- a/internal/oci/spec.go +++ b/internal/oci/spec.go @@ -33,7 +33,7 @@ type SpecModifier interface { // Spec defines the operations to be performed on an OCI specification // -//go:generate moq -stub -out spec_mock.go . Spec +//go:generate moq -rm -fmt=goimports -stub -out spec_mock.go . Spec type Spec interface { Load() (*specs.Spec, error) Flush() error diff --git a/internal/requirements/constraints/constraints.go b/internal/requirements/constraints/constraints.go index 77b23dc8..ca3c62d0 100644 --- a/internal/requirements/constraints/constraints.go +++ b/internal/requirements/constraints/constraints.go @@ -18,7 +18,7 @@ package constraints // Constraint represents a constraint that is to be evaluated // -//go:generate moq -stub -out constraint_mock.go . Constraint +//go:generate moq -rm -fmt=goimports -stub -out constraint_mock.go . Constraint type Constraint interface { String() string Assert() error diff --git a/internal/requirements/constraints/property.go b/internal/requirements/constraints/property.go index 9dc90dbc..c1a754eb 100644 --- a/internal/requirements/constraints/property.go +++ b/internal/requirements/constraints/property.go @@ -25,7 +25,7 @@ import ( // Property represents a property that is used to check requirements // -//go:generate moq -stub -out property_mock.go . Property +//go:generate moq -rm -fmt=goimports -stub -out property_mock.go . Property type Property interface { Name() string Value() (string, error) diff --git a/internal/system/nvdevices/mknod.go b/internal/system/nvdevices/mknod.go index 5754fc40..8cbec51d 100644 --- a/internal/system/nvdevices/mknod.go +++ b/internal/system/nvdevices/mknod.go @@ -25,7 +25,7 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" ) -//go:generate moq -stub -out mknod_mock.go . mknoder +//go:generate moq -rm -fmt=goimports -stub -out mknod_mock.go . mknoder type mknoder interface { Mknode(string, int, int) error } diff --git a/internal/system/nvmodules/cmd.go b/internal/system/nvmodules/cmd.go index 23df4f25..7a9101d5 100644 --- a/internal/system/nvmodules/cmd.go +++ b/internal/system/nvmodules/cmd.go @@ -24,7 +24,7 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" ) -//go:generate moq -stub -out cmd_mock.go . cmder +//go:generate moq -rm -fmt=goimports -stub -out cmd_mock.go . cmder type cmder interface { // Run executes the command and returns the stdout, stderr, and an error if any Run(string, ...string) error diff --git a/pkg/nvcdi/namer.go b/pkg/nvcdi/namer.go index 8edd8f07..8019f699 100644 --- a/pkg/nvcdi/namer.go +++ b/pkg/nvcdi/namer.go @@ -96,7 +96,7 @@ func (s deviceNameUUID) GetMigDeviceName(i int, _ UUIDer, j int, mig UUIDer) (st return uuid, nil } -//go:generate moq -stub -out namer_nvml_mock.go . nvmlUUIDer +//go:generate moq -rm -fmt=goimports -stub -out namer_nvml_mock.go . nvmlUUIDer type nvmlUUIDer interface { GetUUID() (string, nvml.Return) }