style(api): satisfy discovery lint checks

steipete · steipete · commit a618558d8712 · 2026-06-22T12:49:54.000-04:00
diff --git a/internal/cmd/api_test.go b/internal/cmd/api_test.go
@@ -64,15 +64,15 @@ func TestDiscoveryMethodPolicyRequiresExplicitPermission(t *testing.T) {
 }
 
 func TestValidateDiscoveryRedirect(t *testing.T) {
-	trusted, err := http.NewRequest(http.MethodGet, "https://gmail.googleapis.com/gmail/v1/users/me/labels", nil)
+	trusted, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "https://gmail.googleapis.com/gmail/v1/users/me/labels", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := validateDiscoveryRedirect(trusted, nil); err != nil {
-		t.Fatalf("trusted redirect: %v", err)
+	if redirectErr := validateDiscoveryRedirect(trusted, nil); redirectErr != nil {
+		t.Fatalf("trusted redirect: %v", redirectErr)
 	}
 
-	untrusted, err := http.NewRequest(http.MethodGet, "https://example.test/steal", nil)
+	untrusted, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "https://example.test/steal", nil)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/internal/discoveryapi/discovery.go b/internal/discoveryapi/discovery.go
@@ -218,8 +218,9 @@ func BuildURL(description *discovery.RestDescription, method Method, params map[
 func ValidateGoogleAPIURL(requestURL string) error {
 	u, err := url.Parse(requestURL)
 	if err != nil {
-		return fmt.Errorf("%w: %v", ErrUntrustedAPIURL, err)
+		return fmt.Errorf("%w: %w", ErrUntrustedAPIURL, err)
 	}
+
 	host := strings.ToLower(strings.TrimSuffix(u.Hostname(), "."))
 	if u.Scheme != "https" || u.User != nil || host == "" || (host != "googleapis.com" && !strings.HasSuffix(host, ".googleapis.com")) {
 		return fmt.Errorf("%w: %q", ErrUntrustedAPIURL, requestURL)

Original file line number	Diff line number	Diff line change
`@@ -64,15 +64,15 @@ func TestDiscoveryMethodPolicyRequiresExplicitPermission(t *testing.T) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func TestValidateDiscoveryRedirect(t *testing.T) {`
`67`		`- trusted, err := http.NewRequest(http.MethodGet, "https://gmail.googleapis.com/gmail/v1/users/me/labels", nil)`
	`67`	`+ trusted, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "https://gmail.googleapis.com/gmail/v1/users/me/labels", nil)`
`68`	`68`	`if err != nil {`
`69`	`69`	`t.Fatal(err)`
`70`	`70`	`}`
`71`		`- if err := validateDiscoveryRedirect(trusted, nil); err != nil {`
`72`		`- t.Fatalf("trusted redirect: %v", err)`
	`71`	`+ if redirectErr := validateDiscoveryRedirect(trusted, nil); redirectErr != nil {`
	`72`	`+ t.Fatalf("trusted redirect: %v", redirectErr)`
`73`	`73`	`}`
`74`	`74`
`75`		`- untrusted, err := http.NewRequest(http.MethodGet, "https://example.test/steal", nil)`
	`75`	`+ untrusted, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "https://example.test/steal", nil)`
`76`	`76`	`if err != nil {`
`77`	`77`	`t.Fatal(err)`
`78`	`78`	`}`