From 84f7d08724893d5bbedf1d722c94bbab4e4984a0 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 24 Jul 2026 13:33:21 -0700 Subject: [PATCH] Fix non-constant format string vet errors for Go 1.26 toolchain The moc-service-release build now uses the latest MS Go toolchain (go-aka 1.26.5-2), whose `go test` printf vet analyzer rejects non-constant format strings as errors. The releases/v0.26.0 branch (Go 1.22-era code) failed to build under this toolchain while main already carries the equivalent fixes. Add a constant "%s" format verb to the flagged Wrapf/Errorf/Fatalf call sites in pkg/validations, pkg/status, pkg/config, pkg/certs, and pkg/redact so `go test ./pkg/...` passes under Go 1.26. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: a5fc3af6-9324-437e-9933-0bf3cc26b490 --- pkg/certs/certs_test.go | 4 ++-- pkg/config/config_test.go | 2 +- pkg/redact/redact_test.go | 4 ++-- pkg/status/status_test.go | 2 +- pkg/validations/proxy_validation.go | 4 ++-- pkg/validations/proxy_validation_test.go | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/certs/certs_test.go b/pkg/certs/certs_test.go index 431dce69..6b7624d1 100644 --- a/pkg/certs/certs_test.go +++ b/pkg/certs/certs_test.go @@ -584,7 +584,7 @@ func Test_CACertsRenewVerifySameKey(t *testing.T) { clientCerts = [][]byte{certClient1.Raw} if err := caAuth.VerifyClientCertificate(clientCerts); err != nil { - t.Errorf("failed to verify certificate: " + err.Error()) + t.Errorf("failed to verify certificate: %s", err.Error()) } if _, err = tls.X509KeyPair(EncodeCertPEM(certClient1), EncodePrivateKeyPEM(keyClient)); err != nil { t.Errorf("Error Verifying key and cert: %s", err.Error()) @@ -640,7 +640,7 @@ func Test_CACertsRenewVerifySameKey(t *testing.T) { clientCerts = [][]byte{certClient2.Raw} if err := caAuth.VerifyClientCertificate(clientCerts); err != nil { - t.Errorf("failed to verify certificate: " + err.Error()) + t.Errorf("failed to verify certificate: %s", err.Error()) } if _, err = tls.X509KeyPair(EncodeCertPEM(certClient2), EncodePrivateKeyPEM(keyClient)); err != nil { t.Errorf("Error Verifying key and cert: %s", err.Error()) diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index de409f9a..64727077 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -47,7 +47,7 @@ testArray: tmpData := SampleStruct{} err := LoadYAMLConfig(tmpString, &tmpData) if err != nil { - t.Errorf("Failed to load Yaml Config" + err.Error()) + t.Errorf("Failed to load Yaml Config: %s", err.Error()) } } func Test_PrintYAML(t *testing.T) { diff --git a/pkg/redact/redact_test.go b/pkg/redact/redact_test.go index d42d5053..ff3edbb3 100644 --- a/pkg/redact/redact_test.go +++ b/pkg/redact/redact_test.go @@ -188,11 +188,11 @@ func TestRedactErrorJsonSensitiveField(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { val := reflect.ValueOf(tt.inputJson) - err := fmt.Errorf(tt.inputError) + err := fmt.Errorf("%s", tt.inputError) redactErrorJsonSensitiveField(val, &err) - assert.Equal(t, fmt.Errorf(tt.expectedError), err) + assert.Equal(t, fmt.Errorf("%s", tt.expectedError), err) }) } } diff --git a/pkg/status/status_test.go b/pkg/status/status_test.go index f21531ab..a9ccdcb3 100644 --- a/pkg/status/status_test.go +++ b/pkg/status/status_test.go @@ -81,7 +81,7 @@ func simulateStackTraceError(err error, desc string) error { } func returnFakeError(err error, desc string) error { - return errors.Wrapf(err, desc) + return errors.Wrapf(err, "%s", desc) } func TestSetErrorWithStackTraceExcludesStackTrace(t *testing.T) { diff --git a/pkg/validations/proxy_validation.go b/pkg/validations/proxy_validation.go index 426f11cb..f77a2c95 100644 --- a/pkg/validations/proxy_validation.go +++ b/pkg/validations/proxy_validation.go @@ -18,7 +18,7 @@ func ValidateProxyURL(proxyURL string) (*url.URL, error) { parsedURL, err := url.ParseRequestURI(proxyURL) if err != nil { - return nil, errors.Wrapf(errors.InvalidInput, err.Error()) + return nil, errors.Wrapf(errors.InvalidInput, "%s", err.Error()) } // Check if url scheme is http or https @@ -54,7 +54,7 @@ func TestProxyUrlConnection(parsedURL *url.URL, certContent string, getRequestUr // Test the HTTP GET request response, err := client.Get(getRequestUrl) if err != nil { - return errors.Wrapf(errors.InvalidInput, err.Error()) + return errors.Wrapf(errors.InvalidInput, "%s", err.Error()) } else { defer response.Body.Close() fmt.Println("Connected successfully to the proxy server") diff --git a/pkg/validations/proxy_validation_test.go b/pkg/validations/proxy_validation_test.go index 6a5528ba..245cebb6 100644 --- a/pkg/validations/proxy_validation_test.go +++ b/pkg/validations/proxy_validation_test.go @@ -31,7 +31,7 @@ func Test_ValidateProxyURL(t *testing.T) { func Test_TestProxyUrlConnection(t *testing.T) { caCert, _, err := certs.GenerateClientCertificate("ValidCertificate") if err != nil { - t.Fatalf(err.Error()) + t.Fatalf("%s", err.Error()) } certBytes := certs.EncodeCertPEM(caCert) caCertString := string(certBytes)