Sort imports and remove stutter

Signed-off-by: James Munnelly <[email protected]>

Author: munnerz

test/driver/driver_testing.go

@@ -19,6 +19,10 @@ package driver
 import (
 	"crypto"
 	"crypto/x509"
+	"math"
+	"net"
+	"testing"
+
 	cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
 	fakeclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/fake"
 	"github.com/container-storage-interface/spec/lib/go/csi"
@@ -28,17 +32,14 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/mount-utils"
 	"k8s.io/utils/clock"
-	"math"
-	"net"
-	"testing"
 
 	"github.com/cert-manager/csi-lib/driver"
 	"github.com/cert-manager/csi-lib/manager"
 	"github.com/cert-manager/csi-lib/metadata"
 	"github.com/cert-manager/csi-lib/storage"
 )
 
-type DriverOptions struct {
+type Options struct {
 	Clock   clock.Clock
 	Store   storage.Interface
 	Log     *logr.Logger
@@ -56,7 +57,7 @@ type DriverOptions struct {
 	ReadyToRequest     manager.ReadyToRequestFunc
 }
 
-func RunTestDriver(t *testing.T, opts DriverOptions) (DriverOptions, csi.NodeClient, func()) {
+func Run(t *testing.T, opts Options) (Options, csi.NodeClient, func()) {
 	if opts.Log == nil {
 		logger := logrtesting.NewTestLogger(t)
 		opts.Log = &logger

test/integration/issuance_test.go

@@ -43,7 +43,7 @@ import (
 func TestIssuesCertificate(t *testing.T) {
 	store := storage.NewMemoryFS()
 	clock := fakeclock.NewFakeClock(time.Now())
-	opts, cl, stop := testdriver.RunTestDriver(t, testdriver.DriverOptions{
+	opts, cl, stop := testdriver.Run(t, testdriver.Options{
 		Store: store,
 		Clock: clock,
 		GeneratePrivateKey: func(meta metadata.Metadata) (crypto.PrivateKey, error) {
@@ -108,7 +108,7 @@ func TestManager_CleansUpOldRequests(t *testing.T) {
 	store := storage.NewMemoryFS()
 	clock := fakeclock.NewFakeClock(time.Now())
 
-	opts, cl, stop := testdriver.RunTestDriver(t, testdriver.DriverOptions{
+	opts, cl, stop := testdriver.Run(t, testdriver.Options{
 		Store:                store,
 		Clock:                clock,
 		MaxRequestsPerVolume: 1,

test/integration/ready_to_request_test.go

@@ -45,7 +45,7 @@ func Test_CompletesIfNotReadyToRequest_ContinueOnNotReadyEnabled(t *testing.T) {
 	clock := fakeclock.NewFakeClock(time.Now())
 
 	calls := 0
-	opts, cl, stop := testdriver.RunTestDriver(t, testdriver.DriverOptions{
+	opts, cl, stop := testdriver.Run(t, testdriver.Options{
 		Store:              store,
 		Clock:              clock,
 		ContinueOnNotReady: true,
@@ -130,7 +130,7 @@ func TestFailsIfNotReadyToRequest_ContinueOnNotReadyDisabled(t *testing.T) {
 	store := storage.NewMemoryFS()
 	clock := fakeclock.NewFakeClock(time.Now())
 
-	opts, cl, stop := testdriver.RunTestDriver(t, testdriver.DriverOptions{
+	opts, cl, stop := testdriver.Run(t, testdriver.Options{
 		Store:              store,
 		Clock:              clock,
 		ContinueOnNotReady: false,