Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

packages/compass-schema/src/stores/schema-export-reducer.ts

@@ -121,29 +121,37 @@ export const cancelExportSchema = (): SchemaThunkAction<
 async function getSchemaByFormat({
   exportFormat,
   schemaAccessor,
+  signal,
 }: {
   exportFormat: SchemaFormat;
   schemaAccessor: SchemaAccessor;
   signal: AbortSignal;
 }): Promise<string> {
-  // TODO: Use the signal once we pull in the schema accessor type changes.
   let schema:
     | StandardJSONSchema
     | MongoDBJSONSchema
     | ExpandedJSONSchema
     | InternalSchema;
   switch (exportFormat) {
     case 'standardJSON':
-      schema = await schemaAccessor.getStandardJsonSchema();
+      schema = await schemaAccessor.getStandardJsonSchema({
+        signal,
+      });
       break;
     case 'mongoDBJSON':
-      schema = await schemaAccessor.getMongoDBJsonSchema();
+      schema = await schemaAccessor.getMongoDBJsonSchema({
+        signal,
+      });
       break;
     case 'extendedJSON':
-      schema = await schemaAccessor.getExpandedJSONSchema();
+      schema = await schemaAccessor.getExpandedJSONSchema({
+        signal,
+      });
       break;
     case 'legacyJSON':
-      schema = await schemaAccessor.getInternalSchema();
+      schema = await schemaAccessor.getInternalSchema({
+        signal,
+      });
       break;
   }
 

packages/compass-smoke-tests/src/tests/auto-update-to.ts

@@ -57,11 +57,13 @@ export async function testAutoUpdateTo(context: SmokeTestsContext) {
         bucket_key_prefix: context.bucketKeyPrefix,
       });
     } else {
-      process.env.PUBLISHED_RELEASES = JSON.stringify({
-        name: version,
-        body: version,
-        bucket_key_prefix: context.bucketKeyPrefix,
-      });
+      process.env.PUBLISHED_RELEASES = JSON.stringify([
+        {
+          name: version,
+          body: version,
+          bucket_key_prefix: context.bucketKeyPrefix,
+        },
+      ]);
     }
 
     const server = await startAutoUpdateServer();