Merge branch 'main' of github.com:graphql-hive/console into feat/lab-query-plan

Author: mskorokhodov

.changeset/loud-mammals-clean.md

@@ -160,3 +160,4 @@ Cargo.lock
 Cargo.lock
 Cargo.lock
 Cargo.lock
+Cargo.lock

.gitignore

@@ -1,5 +1,20 @@
 # hive
 
+## 11.0.2
+
+### Patch Changes
+
+- [#7940](https://github.com/graphql-hive/console/pull/7940)
+  [`742f50c`](https://github.com/graphql-hive/console/commit/742f50c52e846ab63843635c6f408016a30f6288)
+  Thanks [@jdolle](https://github.com/jdolle)! - Fix lint policy block title color; add policy link
+  to lines and rule id tooltip
+
+- [#7936](https://github.com/graphql-hive/console/pull/7936)
+  [`96bd390`](https://github.com/graphql-hive/console/commit/96bd390c7ffa75baf7db0c0bb3a3117c6ef6f631)
+  Thanks [@jdolle](https://github.com/jdolle)! - Do not cache edge types in graphql eslint. This
+  fixes an issue where edge types were cached between runs and only the cached edge types would be
+  referenced for subsequent runs
+
 ## 11.0.1
 
 ### Patch Changes

deployment/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "hive",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "private": true,
   "scripts": {
     "generate": "tsx generate.ts",

deployment/package.json

@@ -96,16 +96,13 @@ export function deployProxy({
         service: graphql.service,
         requestTimeout: '60s',
         retriable: true,
-        rateLimit: {
-          maxRequests: 10,
-          unit: 'minute',
-        },
       },
       {
         name: 'usage',
         path: '/usage',
         service: usage.service,
         retriable: true,
+        loadBalancerPolicy: 'WeightedLeastRequest',
       },
     ])
     .registerService({ record: environment.apiDns }, [

deployment/services/proxy.ts

@@ -84,6 +84,12 @@ export class Proxy {
       requestTimeout?: `${number}s` | 'infinity';
       idleTimeout?: `${number}s`;
       retriable?: boolean;
+      loadBalancerPolicy?:
+        | 'WeightedLeastRequest'
+        | 'RoundRobin'
+        | 'Random'
+        | 'RequestHash'
+        | 'Cookie';
       customRewrite?: string;
       virtualHost?: Output<string>;
       httpsUpstream?: boolean;
@@ -153,9 +159,9 @@ export class Proxy {
                 port: route.service.spec.ports[0].port,
               },
             ],
-            // https://projectcontour.io/docs/1.29/config/request-routing/#session-affinity
+            // https://projectcontour.io/docs/1.31/config/request-routing/
             loadBalancerPolicy: {
-              strategy: 'Cookie',
+              strategy: route.loadBalancerPolicy ?? 'RoundRobin',
             },
             // https://projectcontour.io/docs/1.29/config/rate-limiting/#local-rate-limiting
             rateLimitPolicy: route.rateLimit

deployment/utils/reverse-proxy.ts

@@ -353,7 +353,7 @@ export function initSeed() {
               const result = await pool.any(psql`
                 UPDATE "organization_access_tokens"
                 SET "expires_at" = NOW()
-                WHERE id IN (${psql.join(tokenIds, psql`, `)}) AND organization_id = ${organization.id}
+                WHERE id IN (${psql.join(tokenIds, psql.fragment`, `)}) AND organization_id = ${organization.id}
                 RETURNING
                   "id"
               `);

integration-tests/testkit/seed.ts

@@ -1,3 +1,4 @@
+import { pollFor } from 'testkit/flow';
 import { graphql } from 'testkit/gql';
 import { ResourceAssignmentModeType } from 'testkit/gql/graphql';
 import { execute } from 'testkit/graphql';
@@ -115,15 +116,19 @@ test.concurrent('cannot delete a role with members', async ({ expect }) => {
 test.concurrent('email invitation', async ({ expect }) => {
   const seed = initSeed();
   const { createOrg } = await seed.createOwner();
-  const { inviteMember } = await createOrg();
+  const { inviteMember, organization } = await createOrg();
 
   const inviteEmail = seed.generateEmail();
   const invitationResult = await inviteMember(inviteEmail);
   const inviteCode = invitationResult.ok?.createdOrganizationInvitation.code;
   expect(inviteCode).toBeDefined();
 
-  const sentEmails = await history();
-  expect(sentEmails).toContainEqual(expect.objectContaining({ to: inviteEmail }));
+  await pollFor(async () => {
+    const sentEmails = await history(inviteEmail);
+    return sentEmails.length > 0;
+  });
+  const sentEmails = await history(inviteEmail);
+  expect(sentEmails[0].subject).toEqual('You have been invited to join ' + organization.slug);
 });
 
 test.concurrent('can not invite with role not existing in organization', async ({ expect }) => {

integration-tests/tests/api/organization/members.spec.ts

@@ -175,7 +175,6 @@
       "eslint@8.57.1": "patches/eslint@8.57.1.patch",
       "@graphql-eslint/eslint-plugin@3.20.1": "patches/@graphql-eslint__eslint-plugin@3.20.1.patch",
       "got@14.4.7": "patches/got@14.4.7.patch",
-      "slonik@30.4.4": "patches/slonik@30.4.4.patch",
       "@oclif/core@3.26.6": "patches/@oclif__core@3.26.6.patch",
       "oclif": "patches/oclif.patch",
       "graphiql": "patches/graphiql.patch",
@@ -184,7 +183,9 @@
       "p-cancelable@4.0.1": "patches/p-cancelable@4.0.1.patch",
       "bentocache": "patches/bentocache.patch",
       "@graphql-codegen/schema-ast": "patches/@graphql-codegen__schema-ast.patch",
-      "@fastify/vite": "patches/@fastify__vite.patch"
+      "@fastify/vite": "patches/@fastify__vite.patch",
+      "@slonik/pg-driver": "patches/@slonik__pg-driver.patch",
+      "slonik": "patches/slonik.patch"
     },
     "onlyBuiltDependencies": [
       "msw"

package.json

@@ -7,8 +7,11 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "slonik": "30.4.4",
-    "slonik-interceptor-query-logging": "46.4.0"
+    "@standard-schema/spec": "1.0.0",
+    "slonik": "48.13.2",
+    "slonik-interceptor-query-logging": "48.13.2",
+    "slonik-sql-tag-raw": "48.13.2",
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@hive/service-common": "workspace:*"