necessary go changes + two more tests

slackhq · Nov 8, 2023 · a5ae0c5 · a5ae0c5
1 parent e58ebef
commit a5ae0c5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/cluster_endtoend_mysql80.yml b/.github/workflows/cluster_endtoend_mysql80.yml
@@ -42,9 +42,10 @@ jobs:
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.19.12
+        go-version: '1.20'
+        check-latest: true
 
     - name: Set up python
       if: steps.changes.outputs.end_to_end == 'true'

diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml
@@ -43,9 +43,10 @@ jobs:
 
     - name: Set up Go
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.19.12
+        go-version: '1.20'
+        check-latest: true
 
     - name: Tune the OS
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'

diff --git a/go/bucketpool/bucketpool_test.go b/go/bucketpool/bucketpool_test.go
@@ -170,6 +170,9 @@ func TestFuzz(t *testing.T) {
 	maxTestSize := 16384
 	for i := 0; i < 20000; i++ {
 		minSize := rand.Intn(maxTestSize)
+		if minSize == 0 {
+			minSize = 1
+		}
 		maxSize := rand.Intn(maxTestSize-minSize) + minSize
 		p := New(minSize, maxSize)
 		bufSize := rand.Intn(maxTestSize)

diff --git a/go/mysql/client_test.go b/go/mysql/client_test.go
@@ -475,7 +475,7 @@ func TestTLSClientVerifyIdentity(t *testing.T) {
 
 	fmt.Printf("Error: %s", err)
 
-	assert.Contains(t, err.Error(), "cannot send HandshakeResponse41: x509:")
+	assert.Contains(t, err.Error(), "cannot send HandshakeResponse41: tls:")
 
 	// Now setup proper CA that is valid to verify
 	params.SslCa = path.Join(root, "ca-cert.pem")

diff --git a/go/test/endtoend/recovery/recovery_util.go b/go/test/endtoend/recovery/recovery_util.go
@@ -63,10 +63,9 @@ func RestoreTablet(t *testing.T, localCluster *cluster.LocalProcessCluster, tabl
 
 	if err != nil {
 		tm := time.Now().UTC()
-		tm.Format(time.RFC3339)
 		_, err := localCluster.VtctlProcess.ExecuteCommandWithOutput("CreateKeyspace", "--",
 			"--keyspace_type=SNAPSHOT", "--base_keyspace="+keyspaceName,
-			"--snapshot_time", restoreTime.Format(time.RFC3339), restoreKSName)
+			"--snapshot_time", tm.Format(time.RFC3339), restoreKSName)
 		require.Nil(t, err)
 	}
 

diff --git a/go/test/fuzzing/vtctl_fuzzer.go b/go/test/fuzzing/vtctl_fuzzer.go
@@ -169,8 +169,8 @@ func Fuzz(data []byte) int {
 	chunkSize := len(restOfArray) / numberOfCalls
 	command := 0
 	for i := 0; i < len(restOfArray); i = i + chunkSize {
-		from := i           //lower
-		to := i + chunkSize //upper
+		from := i           // lower
+		to := i + chunkSize // upper
 
 		// Index of command in getCommandType():
 		commandIndex := int(commandPart[command]) % 68
@@ -179,9 +179,7 @@ func Fuzz(data []byte) int {
 		args := strings.Split(string(restOfArray[from:to]), " ")
 
 		// Add params to the command
-		for i := range args {
-			commandSlice = append(commandSlice, args[i])
-		}
+		commandSlice = append(commandSlice, args...)
 
 		_ = vtctl.RunCommand(ctx, wrangler.New(logger, topo, tmc), commandSlice)
 		command++

diff --git a/go/vt/orchestrator/logic/topology_recovery.go b/go/vt/orchestrator/logic/topology_recovery.go
@@ -658,6 +658,9 @@ func recoverDeadPrimary(ctx context.Context, analysisEntry inst.ReplicationAnaly
 
 	// Read the tablet information from the database to find the shard and keyspace of the tablet
 	tablet, err := inst.ReadTablet(analysisEntry.AnalyzedInstanceKey)
+	if err != nil {
+		return false, nil, err
+	}
 
 	var candidateTabletAlias *topodatapb.TabletAlias
 	if candidateInstanceKey != nil {