From dc96c35aa5a4676690aecab6b2f8691d2044be12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Sibiril?= <81782+aureliensibiril@users.noreply.github.com> Date: Sun, 12 Jul 2026 11:24:01 +0200 Subject: [PATCH] Test the Square and Google Analytics name resolvers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cover the 2xx business/display-name path, the terminal non-2xx branches (401/403/404/500 keep the generic source name), the Square-Version header, and Google Analytics' empty-account-id short-circuit, matching the existing resolver tests. Signed-off-by: Aurélien Sibiril <81782+aureliensibiril@users.noreply.github.com> --- .../drivers/name_resolver_test.go | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/pkg/accessreview/drivers/name_resolver_test.go b/pkg/accessreview/drivers/name_resolver_test.go index cc704a1a1..b2df2e503 100644 --- a/pkg/accessreview/drivers/name_resolver_test.go +++ b/pkg/accessreview/drivers/name_resolver_test.go @@ -802,3 +802,137 @@ type roundTripperFunc func(*http.Request) (*http.Response, error) func (f roundTripperFunc) RoundTrip(r *http.Request) (*http.Response, error) { return f(r) } + +func TestSquareNameResolver(t *testing.T) { + t.Parallel() + + cases := []struct { + name string + status int + body string + want string + }{ + { + name: "200 returns business name", + status: http.StatusOK, + body: `{"merchant":{"business_name":"Acme Coffee"}}`, + want: "Acme Coffee", + }, + { + name: "401 is terminal (no name)", + status: http.StatusUnauthorized, + body: `{"errors":[{"code":"UNAUTHORIZED"}]}`, + want: "", + }, + { + name: "403 is terminal (no name)", + status: http.StatusForbidden, + body: `{"errors":[{"code":"FORBIDDEN"}]}`, + want: "", + }, + { + name: "500 is terminal (no name)", + status: http.StatusInternalServerError, + body: `{"errors":[{"code":"INTERNAL_SERVER_ERROR"}]}`, + want: "", + }, + } + + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + assert.Equal(t, http.MethodGet, r.Method) + assert.Equal(t, "/v2/merchants/me", r.URL.Path) + assert.Equal(t, squareAPIVersion, r.Header.Get("Square-Version")) + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(tc.status) + _, _ = w.Write([]byte(tc.body)) + })) + defer srv.Close() + + client := &http.Client{Transport: &hostRewriter{target: srv.URL}} + + got, err := NewSquareNameResolver(client).ResolveInstanceName(context.Background()) + require.NoError(t, err) + assert.Equal(t, tc.want, got) + }) + } +} + +func TestGoogleAnalyticsNameResolver(t *testing.T) { + t.Parallel() + + t.Run("empty account id returns nothing without HTTP call", func(t *testing.T) { + t.Parallel() + + client := &http.Client{Transport: roundTripperFunc(func(*http.Request) (*http.Response, error) { + t.Fatalf("resolver should not make an HTTP call for an empty account id") + return nil, nil + })} + + got, err := NewGoogleAnalyticsNameResolver(client, "").ResolveInstanceName(context.Background()) + require.NoError(t, err) + assert.Empty(t, got) + }) + + cases := []struct { + name string + status int + body string + want string + }{ + { + name: "200 returns display name", + status: http.StatusOK, + body: `{"displayName":"Acme Analytics"}`, + want: "Acme Analytics", + }, + { + name: "401 is terminal (no name)", + status: http.StatusUnauthorized, + body: `{"error":{"code":401}}`, + want: "", + }, + { + name: "403 is terminal (no name)", + status: http.StatusForbidden, + body: `{"error":{"code":403}}`, + want: "", + }, + { + name: "404 is terminal (no name)", + status: http.StatusNotFound, + body: `{"error":{"code":404}}`, + want: "", + }, + { + name: "500 is terminal (no name)", + status: http.StatusInternalServerError, + body: `{"error":{"code":500}}`, + want: "", + }, + } + + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + assert.Equal(t, http.MethodGet, r.Method) + assert.Equal(t, "/v1alpha/accounts/123456", r.URL.Path) + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(tc.status) + _, _ = w.Write([]byte(tc.body)) + })) + defer srv.Close() + + client := &http.Client{Transport: &hostRewriter{target: srv.URL}} + + got, err := NewGoogleAnalyticsNameResolver(client, "123456").ResolveInstanceName(context.Background()) + require.NoError(t, err) + assert.Equal(t, tc.want, got) + }) + } +}