Remove Gogo-Proto From Testsuite Definitions

internal/common/proto/protoutil.go

@@ -90,3 +90,10 @@ func ToTimestamp(t time.Time) *types.Timestamp {
 		Nanos:   int32(t.Nanosecond()),
 	}
 }
+
+func ToStdDuration(pd *types.Duration) time.Duration {
+	if pd == nil {
+		return 0
+	}
+	return time.Duration(pd.Seconds)*time.Second + time.Duration(pd.Nanos)*time.Nanosecond
+}

internal/common/proto/protoutil_test.go

@@ -105,6 +105,40 @@ func TestToTimestamp(t *testing.T) {
 	}
 }
 
+func TestToDuration(t *testing.T) {
+	tests := map[string]struct {
+		protoDuration *types.Duration
+		stdDuration   time.Duration
+	}{
+		"empty": {
+			protoDuration: &types.Duration{Seconds: 0, Nanos: 0},
+			stdDuration:   0 * time.Second,
+		},
+		"seconds": {
+			protoDuration: &types.Duration{Seconds: 100, Nanos: 0},
+			stdDuration:   100 * time.Second,
+		},
+		"seconds and nanos": {
+			protoDuration: &types.Duration{Seconds: 100, Nanos: 1000},
+			stdDuration:   100*time.Second + 1000*time.Nanosecond,
+		},
+		"negative": {
+			protoDuration: &types.Duration{Seconds: -100, Nanos: -1000},
+			stdDuration:   -100*time.Second - 1000*time.Nanosecond,
+		},
+		"nil": {
+			protoDuration: nil,
+			stdDuration:   0 * time.Second,
+		},
+	}
+	types.TimestampNow()
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			assert.Equal(t, tc.stdDuration, ToStdDuration(tc.protoDuration))
+		})
+	}
+}
+
 func utcDate(year, month, day int) time.Time {
 	return time.Date(year, time.Month(month), day, 0, 0, 0, 0, time.UTC)
 }

internal/testsuite/submitter/submitter.go

@@ -10,6 +10,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/armadaproject/armada/internal/common/armadaerrors"
+	protoutil "github.com/armadaproject/armada/internal/common/proto"
 	"github.com/armadaproject/armada/pkg/api"
 	"github.com/armadaproject/armada/pkg/client"
 )
@@ -46,7 +47,7 @@ func NewSubmitterFromTestSpec(conn *client.ApiConnectionDetails, testSpec *api.T
 		JobSetName:           testSpec.JobSetId,
 		NumBatches:           testSpec.NumBatches,
 		BatchSize:            testSpec.BatchSize,
-		Interval:             testSpec.Interval,
+		Interval:             protoutil.ToStdDuration(testSpec.Interval),
 		RandomClientId:       testSpec.RandomClientId,
 		out:                  out,
 	}

internal/testsuite/testrunner.go

@@ -12,6 +12,7 @@ import (
 	"golang.org/x/exp/maps"
 	"golang.org/x/sync/errgroup"
 
+	protoutil "github.com/armadaproject/armada/internal/common/proto"
 	"github.com/armadaproject/armada/internal/testsuite/eventbenchmark"
 	"github.com/armadaproject/armada/internal/testsuite/eventlogger"
 	"github.com/armadaproject/armada/internal/testsuite/eventsplitter"
@@ -67,8 +68,9 @@ func (srv *TestRunner) Run(ctx context.Context) (err error) {
 
 	// Optional timeout
 	var cancel context.CancelFunc
-	if srv.testSpec.Timeout != 0 {
-		ctx, cancel = context.WithTimeout(ctx, srv.testSpec.Timeout)
+	timeout := protoutil.ToStdDuration(srv.testSpec.Timeout)
+	if timeout != 0 {
+		ctx, cancel = context.WithTimeout(ctx, timeout)
 	} else {
 		ctx, cancel = context.WithCancel(ctx)
 	}