server: enable TestServerControllerLoginLogout for secondary tenants

Fixes: #110002
Epic: CRDB-38970
Release note: none

Author: shubhamdhama

pkg/ccl/serverccl/server_controller_test.go

@@ -563,16 +563,18 @@ func TestServerControllerLoginLogout(t *testing.T) {
 
 	ctx := context.Background()
 
-	srv := serverutils.StartServerOnly(t, base.TestServerArgs{
-		DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(110002),
-	})
+	srv := serverutils.StartServerOnly(t, base.TestServerArgs{})
 	defer srv.Stopper().Stop(ctx)
 	s := srv.ApplicationLayer()
+	isExternal := srv.DeploymentMode().IsExternal()
 
-	client, err := s.GetAuthenticatedHTTPClient(false, serverutils.SingleTenantSession)
+	sessionType := serverutils.SingleTenantSession
+	client, err := s.GetAuthenticatedHTTPClient(false, sessionType)
 	require.NoError(t, err)
 
-	resp, err := client.Post(s.AdminURL().WithPath("/logout").String(), "", nil)
+	// Using `Get` here instead of `Post` because in external process mode, the
+	// server returns a `StatusMethodNotAllowed` error when using `Post`.
+	resp, err := client.Get(s.AdminURL().WithPath("/logout").String())
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
@@ -582,18 +584,33 @@ func TestServerControllerLoginLogout(t *testing.T) {
 	for i, c := range resp.Cookies() {
 		cookieNames[i] = c.Name
 		cookieValues[i] = c.Value
-		require.True(t, c.Secure)
+		// Secure isn't set in external-mode but it is set in other modes.
+		// See https://github.com/cockroachdb/cockroach/pull/143354#pullrequestreview-2751413632.
+		if !isExternal {
+			require.True(t, c.Secure)
+		}
 		if c.Name == "session" {
 			require.True(t, c.HttpOnly)
 		}
 	}
-	require.ElementsMatch(t, []string{"session", "tenant"}, cookieNames)
-	require.ElementsMatch(t, []string{"", ""}, cookieValues)
-
+	expectedCookies := []string{"session"}
+	expectedValues := []string{""}
+	if !isExternal {
+		expectedCookies = append(expectedCookies, "tenant")
+		expectedValues = append(expectedValues, "")
+	}
+	require.ElementsMatch(t, expectedCookies, cookieNames)
+	require.ElementsMatch(t, expectedValues, cookieValues)
+
+	// This part of the test doesn't run in external-process mode since we can't
+	// set a session cookie with name `tenant`—that's only supported by HTTP
+	// servers in the system tenant, which also handle routing for secondary
+	// tenants.
+	if isExternal {
+		return
+	}
 	// Need a new server because the HTTP Client is memoized.
-	srv2 := serverutils.StartServerOnly(t, base.TestServerArgs{
-		DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(110002),
-	})
+	srv2 := serverutils.StartServerOnly(t, base.TestServerArgs{})
 	defer srv2.Stopper().Stop(ctx)
 	s2 := srv2.ApplicationLayer()
 
@@ -623,7 +640,7 @@ func TestServerControllerLoginLogout(t *testing.T) {
 	require.NoError(t, err)
 	cookieJar.SetCookies(s2.AdminURL().URL, []*http.Cookie{
 		{
-			Name:  "multitenant-session",
+			Name:  "tenant",
 			Value: "abc-123",
 		},
 	})