Merge branch 'main' into docs/plugins/instruments

EmrysMyrddin · web-flow · commit ef3ab0e0e82f · 2025-06-13T12:04:20.000+02:00
diff --git a/.changeset/afraid-years-look.md b/.changeset/afraid-years-look.md
@@ -0,0 +1,5 @@
+---
+'hive': patch
+---
+
+Add pg index for getSchemaVersionByActionId to improve lookup performance
diff --git a/.changeset/witty-bags-deny.md b/.changeset/witty-bags-deny.md
@@ -0,0 +1,5 @@
+---
+'hive': minor
+---
+
+Make `Target.graphqlEndpointUrl` available in public GraphQL API
diff --git a/.github/workflows/typescript-typecheck.yaml b/.github/workflows/typescript-typecheck.yaml
@@ -22,10 +22,11 @@ jobs:
 
       - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
         with:
-          version: 'v3.14.2'
+          version: 'v3.18.1'
 
       - name: install helm deps
-        run: helm plugin install https://github.com/losisin/helm-values-schema-json.git
+        run:
+          helm plugin install https://github.com/losisin/helm-values-schema-json.git --version 1.8.0
 
       - name: generate pulumi deps
         run: pnpm --filter hive generate
diff --git a/cypress/e2e/laboratory-preflight.cy.ts b/cypress/e2e/laboratory-preflight.cy.ts
@@ -246,7 +246,7 @@ describe('Execution', () => {
     // Run GraphiQL
     cy.intercept({ headers: preflightHeaders }).as('request');
     cy.get(selectors.graphiql.buttonExecute).click();
-    cy.wait('@request');
+    cy.wait('@request', { timeout: 10_000 });
   });
 
   it('result.request.headers are NOT substituted with environment variables', () => {
@@ -282,7 +282,7 @@ describe('Execution', () => {
       },
     }).as('request');
     cy.get(selectors.graphiql.buttonExecute).click();
-    cy.wait('@request');
+    cy.wait('@request', { timeout: 10_000 });
   });
 
   it('header placeholders are substituted with environment variables', () => {
diff --git a/package.json b/package.json
@@ -115,7 +115,7 @@
       "ws@^8.0.0": "^8.18.0",
       "ws@*": ">=8.18.0 || >=7.5.10 || >=6.2.3 || >=5.2.4",
       "cookie@<0.7.0": "0.7.2",
-      "tar-fs": "2.1.2",
+      "tar-fs": "2.1.3",
       "ip": "npm:neoip@2.1.0",
       "miniflare@3>undici": "5.28.5"
     },
diff --git a/packages/libraries/cli/src/commands/schema/check.ts b/packages/libraries/cli/src/commands/schema/check.ts
@@ -6,7 +6,7 @@ import * as GraphQLSchema from '../../gql/graphql';
 import { graphqlEndpoint } from '../../helpers/config';
 import {
   APIError,
-  GithubCommitRequiredError,
+  CommitRequiredError,
   GithubRepositoryRequiredError,
   InvalidTargetError,
   MissingEndpointError,
@@ -227,7 +227,7 @@ export default class SchemaCheck extends Command<typeof SchemaCheck> {
 
       if (usesGitHubApp) {
         if (!commit) {
-          throw new GithubCommitRequiredError();
+          throw new CommitRequiredError();
         }
         if (!git.repository) {
           throw new GithubRepositoryRequiredError();
diff --git a/packages/libraries/cli/src/commands/schema/publish.ts b/packages/libraries/cli/src/commands/schema/publish.ts
@@ -7,8 +7,8 @@ import * as GraphQLSchema from '../../gql/graphql';
 import { graphqlEndpoint } from '../../helpers/config';
 import {
   APIError,
-  GithubAuthorRequiredError,
-  GithubCommitRequiredError,
+  AuthorRequiredError,
+  CommitRequiredError,
   InvalidSDLError,
   InvalidTargetError,
   MissingEndpointError,
@@ -239,11 +239,11 @@ export default class SchemaPublish extends Command<typeof SchemaPublish> {
       }
 
       if (!author) {
-        throw new GithubAuthorRequiredError();
+        throw new AuthorRequiredError();
       }
 
       if (!commit) {
-        throw new GithubCommitRequiredError();
+        throw new CommitRequiredError();
       }
 
       if (usesGitHubApp) {
diff --git a/packages/libraries/cli/src/helpers/errors.ts b/packages/libraries/cli/src/helpers/errors.ts
@@ -168,12 +168,12 @@ export class SchemaFileEmptyError extends HiveCLIError {
   }
 }
 
-export class GithubCommitRequiredError extends HiveCLIError {
+export class CommitRequiredError extends HiveCLIError {
   constructor() {
     super(
       ExitCode.BAD_INIT,
       errorCode(ErrorCategory.GENERIC, 10),
-      `Couldn't resolve commit sha required for GitHub Application.`,
+      `Couldn't resolve required commit sha. Provide a non-empty author via the '--commit' parameter or execute the command within a git repository.`,
     );
   }
 }
@@ -188,12 +188,12 @@ export class GithubRepositoryRequiredError extends HiveCLIError {
   }
 }
 
-export class GithubAuthorRequiredError extends HiveCLIError {
+export class AuthorRequiredError extends HiveCLIError {
   constructor() {
     super(
       ExitCode.BAD_INIT,
       errorCode(ErrorCategory.GENERIC, 12),
-      `Couldn't resolve commit author required for GitHub Application.`,
+      `Couldn't resolve required commit author. Provide a non-empty author via the '--author' parameter or execute the command within a git repository.`,
     );
   }
 }
diff --git a/packages/libraries/external-composition/package.json b/packages/libraries/external-composition/package.json
@@ -62,7 +62,7 @@
   "devDependencies": {
     "@apollo/composition": "2.9.3",
     "esbuild": "0.25.0",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "graphql": "16.9.0"
   },
   "publishConfig": {
diff --git a/packages/migrations/src/actions/2025.05.28T00-00-00.schema-log-by-ids.ts b/packages/migrations/src/actions/2025.05.28T00-00-00.schema-log-by-ids.ts
@@ -0,0 +1,21 @@
+import { type MigrationExecutor } from '../pg-migrator';
+
+/**
+ * Adds an index specifically for getSchemaVersionByActionId.
+ */
+export default {
+  name: '2025.05.28T00-00-00.schema-log-by-ids.ts',
+  noTransaction: true,
+  run: ({ sql }) => [
+    {
+      name: 'index schema_log_by_ids',
+      query: sql`
+        CREATE INDEX CONCURRENTLY IF NOT EXISTS "schema_log_by_ids" ON "schema_log"(
+          "project_id"
+          , "target_id"
+          , "commit"
+          )
+      `,
+    },
+  ],
+} satisfies MigrationExecutor;
diff --git a/packages/migrations/src/run-pg-migrations.ts b/packages/migrations/src/run-pg-migrations.ts
@@ -166,5 +166,6 @@ export const runPGMigrations = async (args: { slonik: DatabasePool; runTo?: stri
       await import('./actions/2025.05.15T00-00-00.redundant-indices'),
       await import('./actions/2025.05.15T00-00-00.contracts-foreign-key-constraint-fix'),
       await import('./actions/2025.05.15T00-00-01.organization-member-pagination'),
+      await import('./actions/2025.05.28T00-00-00.schema-log-by-ids'),
     ],
   });
diff --git a/packages/services/api/src/modules/target/module.graphql.ts b/packages/services/api/src/modules/target/module.graphql.ts
@@ -268,9 +268,10 @@ export default gql`
     name: String! @deprecated(reason: "Use the 'slug' field instead.")
     project: Project!
     """
-    The endpoint url of the target's explorer instance.
+    The endpoint url of the target's explorer/laboratory instance.
+    This is the public endpoint configured in target's settings.
     """
-    graphqlEndpointUrl: String
+    graphqlEndpointUrl: String @tag(name: "public")
     """
     Whether a dangerous change fails a schema check and requires a manual approval.
     """
diff --git a/packages/services/cdn-worker/package.json b/packages/services/cdn-worker/package.json
@@ -23,7 +23,7 @@
     "bcryptjs": "2.4.3",
     "dotenv": "16.4.7",
     "esbuild": "0.25.0",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "graphql": "16.9.0",
     "itty-router": "4.2.2",
     "itty-router-extras": "0.4.6",
diff --git a/packages/services/commerce/package.json b/packages/services/commerce/package.json
@@ -18,7 +18,7 @@
     "@trpc/server": "10.45.2",
     "date-fns": "4.1.0",
     "dotenv": "16.4.7",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "pino-pretty": "11.3.0",
     "reflect-metadata": "0.2.2",
     "stripe": "17.5.0",
diff --git a/packages/services/policy/package.json b/packages/services/policy/package.json
@@ -18,7 +18,7 @@
     "ajv": "8.17.1",
     "dotenv": "16.4.7",
     "eslint": "8.57.1",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "graphql": "16.9.0",
     "pino-pretty": "11.3.0",
     "zod": "3.24.1",
diff --git a/packages/services/schema/__tests__/cache.spec.ts b/packages/services/schema/__tests__/cache.spec.ts
@@ -220,60 +220,64 @@ test('timeout', async ({ expect }) => {
   expect(spy).toHaveBeenCalledTimes(2);
 });
 
-test('run action again when the action expires', async ({ expect }) => {
-  const ttlMs = 10;
-  const redis = new Redis();
-  const prefix = randomString();
-  const pollIntervalMs = 5;
-  const timeoutMs = 50;
-  const cacheForRequest1 = createCache({
-    redis,
-    logger: {
-      debug: vi.fn() as any,
-      warn: vi.fn() as any,
-    },
-    prefix,
-    pollIntervalMs,
-    timeoutMs,
-    ttlMs: {
-      success: ttlMs,
-      failure: ttlMs,
-    },
-  });
-
-  const cacheForRequest2 = createCache({
-    redis,
-    logger: {
-      debug: vi.fn() as any,
-      warn: vi.fn() as any,
-    },
-    prefix,
-    pollIntervalMs,
-    timeoutMs,
-    ttlMs: {
-      success: ttlMs,
-      failure: ttlMs,
-    },
-  });
-
-  const actionId = randomString();
-  async function actionFn() {
-    await waitFor(timeoutMs - 1);
-    return 'foo';
-  }
+test(
+  'run action again when the action expires',
+  async ({ expect }) => {
+    const ttlMs = 10;
+    const redis = new Redis();
+    const prefix = randomString();
+    const pollIntervalMs = 5;
+    const timeoutMs = 50;
+    const cacheForRequest1 = createCache({
+      redis,
+      logger: {
+        debug: vi.fn() as any,
+        warn: vi.fn() as any,
+      },
+      prefix,
+      pollIntervalMs,
+      timeoutMs,
+      ttlMs: {
+        success: ttlMs,
+        failure: ttlMs,
+      },
+    });
+
+    const cacheForRequest2 = createCache({
+      redis,
+      logger: {
+        debug: vi.fn() as any,
+        warn: vi.fn() as any,
+      },
+      prefix,
+      pollIntervalMs,
+      timeoutMs,
+      ttlMs: {
+        success: ttlMs,
+        failure: ttlMs,
+      },
+    });
+
+    const actionId = randomString();
+    async function actionFn() {
+      await waitFor(timeoutMs - 1);
+      return 'foo';
+    }
 
-  const exec1 = cacheForRequest1.reuse(actionId, actionFn);
-  const exec2 = cacheForRequest2.reuse(actionId, actionFn);
+    const exec1 = cacheForRequest1.reuse(actionId, actionFn);
+    const exec2 = cacheForRequest2.reuse(actionId, actionFn);
 
-  const run1 = exec1({});
-  const run2 = exec2({});
-  // force the cache to expire
-  await waitFor(ttlMs + 10);
-  await redis.flushall();
+    const run1 = exec1({});
+    const run2 = exec2({});
+    // force the cache to expire
+    await waitFor(ttlMs + 10);
+    await redis.flushall();
 
-  await expect(run1).resolves.toBe('foo');
-  await expect(run2).resolves.toBe('foo');
-});
+    await expect(run1).resolves.toBe('foo');
+    await expect(run2).resolves.toBe('foo');
+  },
+  { retry: 3 },
+);
 
 test('decide on cache duration', async ({ expect }) => {
   const ttlMs = {
diff --git a/packages/services/schema/package.json b/packages/services/schema/package.json
@@ -21,7 +21,7 @@
     "@types/ioredis-mock": "8.2.5",
     "dotenv": "16.4.7",
     "fast-json-stable-stringify": "2.1.0",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "fastq": "1.19.1",
     "got": "14.4.7",
     "graphql": "16.9.0",
diff --git a/packages/services/server/package.json b/packages/services/server/package.json
@@ -37,7 +37,7 @@
     "@trpc/server": "10.45.2",
     "@whatwg-node/server": "0.10.5",
     "dotenv": "16.4.7",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "got": "14.4.7",
     "graphql": "16.9.0",
     "graphql-yoga": "5.13.3",
diff --git a/packages/services/service-common/package.json b/packages/services/service-common/package.json
@@ -23,7 +23,7 @@
     "@sentry/node": "7.120.2",
     "@sentry/types": "7.120.2",
     "@sentry/utils": "7.120.2",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "fastify-plugin": "4.5.1",
     "opentelemetry-instrumentation-fetch-node": "1.2.3",
     "p-retry": "6.2.1",
diff --git a/packages/services/tokens/package.json b/packages/services/tokens/package.json
@@ -15,7 +15,7 @@
     "@trpc/server": "10.45.2",
     "@types/ms": "0.7.34",
     "dotenv": "16.4.7",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "ioredis": "5.4.2",
     "lru-cache": "11.0.2",
     "ms": "2.1.3",
diff --git a/packages/web/app/package.json b/packages/web/app/package.json
@@ -91,7 +91,7 @@
     "dotenv": "16.4.7",
     "echarts": "5.6.0",
     "echarts-for-react": "3.0.2",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "formik": "2.4.6",
     "framer-motion": "11.16.1",
     "graphiql": "4.0.0-alpha.5",
diff --git a/packages/web/docs/src/components/cli-errors.tsx b/packages/web/docs/src/components/cli-errors.tsx
diff --git a/packages/web/docs/src/content/api-reference/cli.mdx b/packages/web/docs/src/content/api-reference/cli.mdx
diff --git a/packages/web/docs/src/content/gateway/other-features/performance/index.mdx b/packages/web/docs/src/content/gateway/other-features/performance/index.mdx
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'hive': patch
 +---
++
 +Add pg index for getSchemaVersionByActionId to improve lookup performance
Original file line number	Diff line number	Diff line change
`@@ -168,12 +168,12 @@ export class SchemaFileEmptyError extends HiveCLIError {`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`171`		`-export class GithubCommitRequiredError extends HiveCLIError {`
	`171`	`+export class CommitRequiredError extends HiveCLIError {`
`172`	`172`	`constructor() {`
`173`	`173`	`super(`
`174`	`174`	`ExitCode.BAD_INIT,`
`175`	`175`	`errorCode(ErrorCategory.GENERIC, 10),`
`176`		- `Couldn't resolve commit sha required for GitHub Application.`,
	`176`	+ `Couldn't resolve required commit sha. Provide a non-empty author via the '--commit' parameter or execute the command within a git repository.`,
`177`	`177`	`);`
`178`	`178`	`}`
`179`	`179`	`}`
`@@ -188,12 +188,12 @@ export class GithubRepositoryRequiredError extends HiveCLIError {`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`
`191`		`-export class GithubAuthorRequiredError extends HiveCLIError {`
	`191`	`+export class AuthorRequiredError extends HiveCLIError {`
`192`	`192`	`constructor() {`
`193`	`193`	`super(`
`194`	`194`	`ExitCode.BAD_INIT,`
`195`	`195`	`errorCode(ErrorCategory.GENERIC, 12),`
`196`		- `Couldn't resolve commit author required for GitHub Application.`,
	`196`	+ `Couldn't resolve required commit author. Provide a non-empty author via the '--author' parameter or execute the command within a git repository.`,
`197`	`197`	`);`
`198`	`198`	`}`
`199`	`199`	`}`