Update all the Go dependencies (vitessio#11741)

* Update all the Go dependencies

This seems to work for the basics just fine, so let's have CI take a run
at this as well to update these.

Only one small update to the Azure blob storage handling seems needed so
far.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Use correct proto comparisons

We're using `reflect.DeepEqual` or `testify` helpers that essentially
use that in a number of places are comparing protobufs. This is not
supported though, protobufs are not comparable with `reflect.DeepEqual`.

This is exposed because of the tiny patch bump of protobuf which changes
some internal optimization of how it initializes protobufs that breaks
all this.

Instead, move to the appropriate helpers here.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

go/sqltypes/result_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package sqltypes
 
 import (
-	"reflect"
 	"testing"
 
 	"vitess.io/vitess/go/test/utils"
@@ -31,20 +30,20 @@ func TestRepair(t *testing.T) {
 	}, {
 		Type: VarChar,
 	}}
-	in := Result{
+	in := &Result{
 		Rows: [][]Value{
 			{TestValue(VarBinary, "1"), TestValue(VarBinary, "aa")},
 			{TestValue(VarBinary, "2"), TestValue(VarBinary, "bb")},
 		},
 	}
-	want := Result{
+	want := &Result{
 		Rows: [][]Value{
 			{TestValue(Int64, "1"), TestValue(VarChar, "aa")},
 			{TestValue(Int64, "2"), TestValue(VarChar, "bb")},
 		},
 	}
 	in.Repair(fields)
-	if !reflect.DeepEqual(in, want) {
+	if !in.Equal(want) {
 		t.Errorf("Repair:\n%#v, want\n%#v", in, want)
 	}
 }
@@ -85,7 +84,7 @@ func TestTruncate(t *testing.T) {
 	}
 
 	out := in.Truncate(0)
-	if !reflect.DeepEqual(out, in) {
+	if !out.Equal(in) {
 		t.Errorf("Truncate(0):\n%v, want\n%v", out, in)
 	}
 
@@ -102,7 +101,7 @@ func TestTruncate(t *testing.T) {
 			{TestValue(Int64, "3")},
 		},
 	}
-	if !reflect.DeepEqual(out, want) {
+	if !out.Equal(want) {
 		t.Errorf("Truncate(1):\n%v, want\n%v", out, want)
 	}
 }
@@ -279,19 +278,21 @@ func TestStripMetaData(t *testing.T) {
 		},
 	}}
 	for _, tcase := range testcases {
-		inCopy := tcase.in.Copy()
-		out := inCopy.StripMetadata(tcase.includedFields)
-		if !reflect.DeepEqual(out, tcase.expected) {
-			t.Errorf("StripMetaData unexpected result for %v: %v", tcase.name, out)
-		}
-		if len(tcase.in.Fields) > 0 {
-			// check the out array is different than the in array.
-			if out.Fields[0] == inCopy.Fields[0] && tcase.includedFields != querypb.ExecuteOptions_ALL {
-				t.Errorf("StripMetaData modified original Field for %v", tcase.name)
+		t.Run(tcase.name, func(t *testing.T) {
+			inCopy := tcase.in.Copy()
+			out := inCopy.StripMetadata(tcase.includedFields)
+			if !out.Equal(tcase.expected) {
+				t.Errorf("StripMetaData unexpected result for %v: %v", tcase.name, out)
+			}
+			if len(tcase.in.Fields) > 0 {
+				// check the out array is different than the in array.
+				if out.Fields[0] == inCopy.Fields[0] && tcase.includedFields != querypb.ExecuteOptions_ALL {
+					t.Errorf("StripMetaData modified original Field for %v", tcase.name)
+				}
 			}
-		}
-		// check we didn't change the original result.
-		utils.MustMatch(t, tcase.in, inCopy)
+			// check we didn't change the original result.
+			utils.MustMatch(t, tcase.in, inCopy)
+		})
 	}
 }
 
@@ -340,7 +341,7 @@ func TestAppendResult(t *testing.T) {
 
 	result.AppendResult(src)
 
-	if !reflect.DeepEqual(result, want) {
+	if !result.Equal(want) {
 		t.Errorf("Got:\n%#v, want:\n%#v", result, want)
 	}
 }

go/stats/statsd/statsd_test.go

@@ -55,8 +55,8 @@ func TestStatsdCounter(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.counter_name:1|c"
-			assert.Equal(t, result, expected)
+			expected := "test.counter_name:1|c\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -84,8 +84,8 @@ func TestStatsdGauge(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.gauge_name:10.000000|g"
-			assert.Equal(t, result, expected)
+			expected := "test.gauge_name:10|g\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -113,8 +113,8 @@ func TestStatsdGaugeFloat64(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.gauge_name_f64:3.140000|g"
-			assert.Equal(t, result, expected)
+			expected := "test.gauge_name_f64:3.14|g\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -143,8 +143,8 @@ func TestStatsdGaugeFunc(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.gauge_func_name:2.000000|g"
-			assert.Equal(t, result, expected)
+			expected := "test.gauge_func_name:2|g\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -172,8 +172,8 @@ func TestStatsdCounterDuration(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.counter_duration_name:1.000000|ms"
-			assert.Equal(t, result, expected)
+			expected := "test.counter_duration_name:1.000000|ms\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -203,11 +203,12 @@ func TestStatsdCountersWithSingleLabel(t *testing.T) {
 			result := strings.Split(string(bytes[:n]), "\n")
 			sort.Strings(result)
 			expected := []string{
+				"",
 				"test.counter_with_single_label_name:0|c|#label:tag2",
 				"test.counter_with_single_label_name:2|c|#label:tag1",
 			}
 			for i, res := range result {
-				assert.Equal(t, res, expected[i])
+				assert.Equal(t, expected[i], res)
 			}
 		}
 	})
@@ -236,8 +237,8 @@ func TestStatsdCountersWithMultiLabels(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.counter_with_multiple_label_name:1|c|#label1:foo,label2:bar"
-			assert.Equal(t, result, expected)
+			expected := "test.counter_with_multiple_label_name:1|c|#label1:foo,label2:bar\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -271,11 +272,12 @@ func TestStatsdCountersFuncWithMultiLabels(t *testing.T) {
 			result := strings.Split(string(bytes[:n]), "\n")
 			sort.Strings(result)
 			expected := []string{
+				"",
 				"test.counter_func_with_multiple_labels_name:1|c|#label1:foo,label2:bar",
 				"test.counter_func_with_multiple_labels_name:2|c|#label1:bar,label2:baz",
 			}
 			for i, res := range result {
-				assert.Equal(t, res, expected[i])
+				assert.Equal(t, expected[i], res)
 			}
 		}
 	})
@@ -304,8 +306,8 @@ func TestStatsdGaugesWithMultiLabels(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.gauges_with_multiple_label_name:3.000000|g|#label1:foo,label2:bar"
-			assert.Equal(t, result, expected)
+			expected := "test.gauges_with_multiple_label_name:3|g|#label1:foo,label2:bar\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -339,11 +341,12 @@ func TestStatsdGaugesFuncWithMultiLabels(t *testing.T) {
 			result := strings.Split(string(bytes[:n]), "\n")
 			sort.Strings(result)
 			expected := []string{
-				"test.gauges_func_with_multiple_labels_name:1.000000|g|#label1:foo,label2:bar",
-				"test.gauges_func_with_multiple_labels_name:2.000000|g|#label1:bar,label2:baz",
+				"",
+				"test.gauges_func_with_multiple_labels_name:1|g|#label1:foo,label2:bar",
+				"test.gauges_func_with_multiple_labels_name:2|g|#label1:bar,label2:baz",
 			}
 			for i, res := range result {
-				assert.Equal(t, res, expected[i])
+				assert.Equal(t, expected[i], res)
 			}
 		}
 	})
@@ -372,8 +375,8 @@ func TestStatsdGaugesWithSingleLabel(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.gauges_with_single_label_name:1.000000|g|#label1:bar"
-			assert.Equal(t, result, expected)
+			expected := "test.gauges_with_single_label_name:1|g|#label1:bar\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -401,8 +404,8 @@ func TestStatsdMultiTimings(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.multi_timings_name:10.000000|ms|#label1:foo,label2:bar"
-			assert.Equal(t, result, expected)
+			expected := "test.multi_timings_name:10.000000|ms|#label1:foo,label2:bar\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -430,8 +433,8 @@ func TestStatsdTimings(t *testing.T) {
 				t.Fatal(err)
 			}
 			result := string(bytes[:n])
-			expected := "test.timings_name:2.000000|ms|#label1:foo"
-			assert.Equal(t, result, expected)
+			expected := "test.timings_name:2.000000|ms|#label1:foo\n"
+			assert.Equal(t, expected, result)
 		}
 	})
 	if !found {
@@ -462,12 +465,13 @@ func TestStatsdHistogram(t *testing.T) {
 			}
 			result := string(bytes[:n])
 			expected := []string{
-				"test.histogram_name:2.000000|h",
-				"test.histogram_name:3.000000|h",
-				"test.histogram_name:6.000000|h",
+				"test.histogram_name:2|h",
+				"test.histogram_name:3|h",
+				"test.histogram_name:6|h",
+				"",
 			}
 			for i, res := range strings.Split(result, "\n") {
-				assert.Equal(t, res, expected[i])
+				assert.Equal(t, expected[i], res)
 			}
 		}
 	})

go/vt/mysqlctl/azblobbackupstorage/azblob.go

@@ -264,7 +264,7 @@ func (bh *AZBlobBackupHandle) ReadFile(ctx context.Context, filename string) (io
 	}
 	blobURL := containerURL.NewBlobURL(obj)
 
-	resp, err := blobURL.Download(ctx, 0, azblob.CountToEnd, azblob.BlobAccessConditions{}, false)
+	resp, err := blobURL.Download(ctx, 0, azblob.CountToEnd, azblob.BlobAccessConditions{}, false, azblob.ClientProvidedKeyOptions{})
 	if err != nil {
 		return nil, err
 	}

go/vt/vtadmin/api_test.go

@@ -567,7 +567,7 @@ func TestFindSchema(t *testing.T) {
 			}
 
 			assert.NoError(t, err)
-			assert.Equal(t, tt.expected, resp)
+			assert.Truef(t, proto.Equal(tt.expected, resp), "expected %v, got %v", tt.expected, resp)
 		})
 	}
 
@@ -815,7 +815,7 @@ func TestFindSchema(t *testing.T) {
 		}
 
 		assert.NoError(t, err)
-		assert.Equal(t, expected, schema)
+		assert.Truef(t, proto.Equal(expected, schema), "expected %v, got %v", expected, schema)
 	})
 }
 
@@ -1091,7 +1091,7 @@ func TestGetKeyspace(t *testing.T) {
 				}
 
 				assert.NoError(t, err)
-				assert.Equal(t, tt.expected, ks)
+				assert.Truef(t, proto.Equal(tt.expected, ks), "expected %v, got %v", tt.expected, ks)
 			}, vtctlds...)
 		})
 	}
@@ -1575,7 +1575,7 @@ func TestGetSchema(t *testing.T) {
 				}
 
 				assert.NoError(t, err)
-				assert.Equal(t, tt.expected, resp)
+				assert.Truef(t, proto.Equal(tt.expected, resp), "expected %v, got %v", tt.expected, resp)
 			})
 		})
 	}
@@ -1742,7 +1742,7 @@ func TestGetSchema(t *testing.T) {
 		}
 
 		assert.NoError(t, err)
-		assert.Equal(t, expected, schema)
+		assert.Truef(t, proto.Equal(expected, schema), "expected %v, got %v", expected, schema)
 	})
 }
 
@@ -2556,7 +2556,7 @@ func TestGetSchemas(t *testing.T) {
 		}
 
 		assert.NoError(t, err)
-		assert.ElementsMatch(t, expected.Schemas, resp.Schemas)
+		assert.Truef(t, proto.Equal(expected, resp), "expected: %v, got: %v", expected, resp)
 	})
 }
 
@@ -2717,7 +2717,7 @@ func TestGetSrvVSchema(t *testing.T) {
 				}
 
 				require.NoError(t, err)
-				assert.Equal(t, tt.expected, resp)
+				assert.Truef(t, proto.Equal(tt.expected, resp), "expected %v, got %v", tt.expected, resp)
 			})
 		})
 	}
@@ -3609,7 +3609,7 @@ func TestGetVSchema(t *testing.T) {
 			}
 
 			assert.NoError(t, err)
-			assert.Equal(t, tt.expected, resp)
+			assert.Truef(t, proto.Equal(tt.expected, resp), "expected %v, got %v", tt.expected, resp)
 		})
 	}
 }
@@ -4155,7 +4155,7 @@ func TestGetWorkflow(t *testing.T) {
 			}
 
 			assert.NoError(t, err)
-			assert.Equal(t, tt.expected, resp)
+			assert.Truef(t, proto.Equal(tt.expected, resp), "expected %v, got %v", tt.expected, resp)
 		})
 	}
 }