lint

Signed-off-by: Chris Martin <chris@cmartinit.co.uk>

Author: d80tb7

internal/common/ingest/testfixtures/event.go

@@ -3,9 +3,8 @@ package testfixtures
 import (
 	"time"
 
-	"google.golang.org/protobuf/proto"
-
 	"github.com/google/uuid"
+	"google.golang.org/protobuf/proto"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 

internal/common/proto/protoutil.go

@@ -3,7 +3,7 @@ package protoutil
 import (
 	"time"
 
-	proto2 "github.com/golang/protobuf/proto"
+	legacyproto "github.com/golang/protobuf/proto"
 	"google.golang.org/protobuf/proto"
 
 	"github.com/pkg/errors"
@@ -69,8 +69,8 @@ func MustMarshall(msg proto.Message) []byte {
 	return b
 }
 
-func MustMarshallProto2(msg proto2.Message) []byte {
-	b, err := proto2.Marshal(msg)
+func MustMarshallLegacyProto(msg legacyproto.Message) []byte {
+	b, err := legacyproto.Marshal(msg)
 	if err != nil {
 		panic(errors.Wrap(err, "Error marshalling object"))
 	}

internal/executor/reporter/event.go

@@ -4,9 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"google.golang.org/protobuf/types/known/timestamppb"
-
 	"github.com/pkg/errors"
+	"google.golang.org/protobuf/types/known/timestamppb"
 	v1 "k8s.io/api/core/v1"
 	networking "k8s.io/api/networking/v1"
 

internal/scheduler/database/executor_repository_test.go

@@ -4,11 +4,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/armadaproject/armada/internal/common/testutil"
+
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/slices"
-	"google.golang.org/protobuf/proto"
 
 	"github.com/armadaproject/armada/internal/common/armadacontext"
 	protoutil "github.com/armadaproject/armada/internal/common/proto"
@@ -77,7 +78,7 @@ func TestExecutorRepository_LoadAndSave(t *testing.T) {
 				slices.SortFunc(tc.executors, executorSort)
 				require.Equal(t, len(tc.executors), len(retrievedExecutors))
 				for i, expected := range tc.executors {
-					assert.True(t, proto.Equal(expected, retrievedExecutors[i]))
+					testutil.AssertProtoEqual(t, expected, retrievedExecutors[i])
 				}
 
 				return nil

internal/scheduler/database/job_repository_test.go

@@ -5,13 +5,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/armadaproject/armada/internal/common/testutil"
+
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/slices"
-	"google.golang.org/protobuf/proto"
 	v1 "k8s.io/api/core/v1"
 
 	"github.com/armadaproject/armada/internal/common/armadacontext"
@@ -375,10 +376,7 @@ func TestFetchJobRunErrors(t *testing.T) {
 					require.Error(t, err)
 				} else {
 					require.NoError(t, err)
-					require.Equal(t, len(tc.expected), len(received))
-					for k, v := range received {
-						assert.True(t, proto.Equal(tc.expected[k], v))
-					}
+					testutil.AssertProtoEqual(t, tc.expected, received)
 				}
 				cancel()
 				return nil

internal/server/submit/validation/submit_request_test.go

@@ -592,7 +592,7 @@ func TestValidatePodSpecSize(t *testing.T) {
 		},
 	}
 
-	defaultPodSpecSize := uint(len(protoutil.MustMarshallProto2(defaultPodSpec)))
+	defaultPodSpecSize := uint(len(protoutil.MustMarshallLegacyProto(defaultPodSpec)))
 
 	tests := map[string]struct {
 		req            *api.JobSubmitRequestItem

magefiles/proto.go

@@ -196,7 +196,5 @@ func protoProtocRun(armada, grpcGateway bool, swaggerFileName string, paths ...s
 
 	args = append(args, paths...)
 
-	println(strings.Join(args, " "))
-
 	return protocRun(args...)
 }