fix(openapi): fetch analyticsdata Discovery from the service host (#1955)

* fix(openapi): fetch analyticsdata Discovery from the service host

The central Discovery directory does not list the GA4 Data API, so
https://www.googleapis.com/discovery/v1/apis/analyticsdata/v1beta/rest
answers 404 and importing the source fails. Route analyticsdata to its
own host the way forms, keep and photospicker already are.

* Test queue timeout with a controlled clock

* Verify Analytics Data discovery import end to end

---------

Co-authored-by: Rhys Sullivan <39114868+RhysSullivan@users.noreply.github.com>

Author: smrht

.changeset/great-hoops-repeat.md

@@ -0,0 +1,9 @@
+---
+"@executor-js/plugin-openapi": patch
+---
+
+Fetch Google Analytics Data (`analyticsdata`) Discovery from the service's own
+host. The central directory does not list the GA4 Data API, so the canonical
+`https://www.googleapis.com/discovery/v1/apis/analyticsdata/v1beta/rest` answers
+404 and the source fails to import. Same treatment `forms`, `keep` and
+`photospicker` already get.

apps/cloud/src/mcp/session-build-semaphore.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it, beforeEach } from "@effect/vitest";
+import { describe, expect, it, beforeEach, afterEach, vi } from "@effect/vitest";
 
 import {
   acquireBuildSlot,
@@ -13,6 +13,10 @@ describe("session-build-semaphore", () => {
     resetBuildSlotsForTest();
   });
 
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
   it("grants up to the cap immediately, with no wait", async () => {
     const results = await Promise.all([
       acquireBuildSlot().promise,
@@ -214,6 +218,7 @@ describe("session-build-semaphore", () => {
   });
 
   it("proceeds without a slot when the queue wait exceeds the timeout, and does not count it as active", async () => {
+    vi.useFakeTimers();
     await Promise.all([
       acquireBuildSlot().promise,
       acquireBuildSlot().promise,
@@ -223,6 +228,10 @@ describe("session-build-semaphore", () => {
     expect(currentActiveBuildsForTest()).toBe(4);
 
     const timedOutHandle = acquireBuildSlot(10);
+    await vi.advanceTimersByTimeAsync(9);
+    expect(currentQueueLengthForTest()).toBe(1);
+    expect(currentActiveBuildsForTest()).toBe(4);
+    await vi.advanceTimersByTimeAsync(1);
     const result = await timedOutHandle.promise;
 
     expect(result).toEqual({ acquired: false, waitMs: expect.any(Number), timedOut: true });

e2e/scenarios/google-analyticsdata-discovery.test.ts

@@ -0,0 +1,57 @@
+import { randomBytes, randomUUID } from "node:crypto";
+import { expect } from "@effect/vitest";
+import { Effect } from "effect";
+import { composePluginApi } from "@executor-js/api/server";
+import { openApiHttpPlugin } from "@executor-js/plugin-openapi/api";
+import {
+  AuthTemplateSlug,
+  ConnectionName,
+  IntegrationSlug,
+  ProviderItemId,
+} from "@executor-js/sdk/shared";
+
+import { scenario } from "../src/scenario";
+import { Api, Target } from "../src/services";
+
+const api = composePluginApi([openApiHttpPlugin()] as const);
+
+scenario(
+  "Google Analytics Data · public Discovery import exposes report tools",
+  { timeout: 120_000 },
+  Effect.gen(function* () {
+    const target = yield* Target;
+    const { client } = yield* Api;
+    const identity = yield* target.newIdentity();
+    const apiClient = yield* client(api, identity);
+    const slug = IntegrationSlug.make(`analytics_${randomBytes(4).toString("hex")}`);
+    // Fetch Google's public document through the real server import path.
+    // No Analytics account or authenticated report request is needed.
+    const added = yield* apiClient.openapi.addSpec({
+      payload: {
+        slug,
+        spec: {
+          kind: "url",
+          url: "https://www.googleapis.com/discovery/v1/apis/analyticsdata/v1beta/rest",
+        },
+      },
+    });
+    yield* Effect.gen(function* () {
+      expect(added.toolCount).toBeGreaterThan(0);
+      const providers = yield* apiClient.providers.list();
+      const provider = providers[0];
+      if (provider === undefined) return yield* Effect.die("No credential provider available");
+      yield* apiClient.connections.create({
+        payload: {
+          owner: "org",
+          name: ConnectionName.make("main"),
+          integration: slug,
+          template: AuthTemplateSlug.make("googleOAuth2"),
+          from: { provider, id: ProviderItemId.make(randomUUID()) },
+        },
+      });
+      const tools = yield* apiClient.tools.list({ query: { integration: slug } });
+      expect(tools.some((tool) => tool.name.endsWith("runReport"))).toBe(true);
+      expect(tools.some((tool) => tool.name.endsWith("runRealtimeReport"))).toBe(true);
+    }).pipe(Effect.ensuring(apiClient.openapi.removeSpec({ params: { slug } }).pipe(Effect.orDie)));
+  }),
+);

packages/plugins/openapi/src/providers/google/discovery.test.ts

@@ -159,6 +159,11 @@ it("accepts only supported HTTPS Google Discovery endpoints", () => {
       "https://www.googleapis.com/discovery/v1/apis/photospicker/v1/rest",
     ),
   ).toBe("https://photospicker.googleapis.com/$discovery/rest?version=v1");
+  expect(
+    normalizeGoogleDiscoveryUrl(
+      "https://www.googleapis.com/discovery/v1/apis/analyticsdata/v1beta/rest",
+    ),
+  ).toBe("https://analyticsdata.googleapis.com/$discovery/rest?version=v1beta");
   expect(
     normalizeGoogleDiscoveryUrl("https://www.googleapis.com/discovery/v1/apis/forms/v1/rest"),
   ).toBe("https://forms.googleapis.com/$discovery/rest?version=v1");
@@ -171,6 +176,11 @@ it("accepts only supported HTTPS Google Discovery endpoints", () => {
   expect(
     normalizeGoogleDiscoveryUrl("https://photospicker.googleapis.com/$discovery/rest?version=v1"),
   ).toBe("https://photospicker.googleapis.com/$discovery/rest?version=v1");
+  expect(
+    normalizeGoogleDiscoveryUrl(
+      "https://analyticsdata.googleapis.com/$discovery/rest?version=v1beta",
+    ),
+  ).toBe("https://analyticsdata.googleapis.com/$discovery/rest?version=v1beta");
   expect(
     normalizeGoogleDiscoveryUrl("https://forms.googleapis.com/$discovery/rest?version=v1"),
   ).toBe("https://forms.googleapis.com/$discovery/rest?version=v1");

packages/plugins/openapi/src/providers/google/discovery.ts

@@ -41,6 +41,7 @@ type GoogleDiscoveryServiceOverride = {
 };
 
 const GOOGLE_DISCOVERY_SERVICE_OVERRIDES: Record<string, GoogleDiscoveryServiceOverride> = {
+  analyticsdata: { preserveServiceHostedUrl: true },
   forms: { preserveServiceHostedUrl: true },
   keep: { preserveServiceHostedUrl: true },
   [GOOGLE_PHOTOS_PICKER_SERVICE]: {