eas-cli 2.7.0 → 2.8.0

package/build/submit/ArchiveSource.js

@@ -21,69 +21,74 @@ var ArchiveSourceType;
     ArchiveSourceType[ArchiveSourceType["latest"] = 1] = "latest";
     ArchiveSourceType[ArchiveSourceType["path"] = 2] = "path";
     ArchiveSourceType[ArchiveSourceType["buildId"] = 3] = "buildId";
-    ArchiveSourceType[ArchiveSourceType["buildList"] = 4] = "buildList";
-    ArchiveSourceType[ArchiveSourceType["prompt"] = 5] = "prompt";
+    ArchiveSourceType[ArchiveSourceType["build"] = 4] = "build";
+    ArchiveSourceType[ArchiveSourceType["buildList"] = 5] = "buildList";
+    ArchiveSourceType[ArchiveSourceType["prompt"] = 6] = "prompt";
+    ArchiveSourceType[ArchiveSourceType["gcs"] = 7] = "gcs";
 })(ArchiveSourceType = exports.ArchiveSourceType || (exports.ArchiveSourceType = {}));
-async function getArchiveAsync(graphqlClient, source) {
+async function getArchiveAsync(ctx, source) {
     switch (source.sourceType) {
         case ArchiveSourceType.prompt: {
-            return await handlePromptSourceAsync(graphqlClient, source);
+            return await handlePromptSourceAsync(ctx);
         }
         case ArchiveSourceType.url: {
-            return await handleUrlSourceAsync(graphqlClient, source);
+            return await handleUrlSourceAsync(ctx, source);
         }
         case ArchiveSourceType.latest: {
-            return await handleLatestSourceAsync(graphqlClient, source);
+            return await handleLatestSourceAsync(ctx);
         }
         case ArchiveSourceType.path: {
-            return await handlePathSourceAsync(graphqlClient, source);
+            return await handlePathSourceAsync(ctx, source);
         }
         case ArchiveSourceType.buildId: {
-            return await handleBuildIdSourceAsync(graphqlClient, source);
+            return await handleBuildIdSourceAsync(ctx, source);
         }
         case ArchiveSourceType.buildList: {
-            return await handleBuildListSourceAsync(graphqlClient, source);
+            return await handleBuildListSourceAsync(ctx);
+        }
+        case ArchiveSourceType.gcs: {
+            return source;
+        }
+        case ArchiveSourceType.build: {
+            return source;
         }
     }
 }
 exports.getArchiveAsync = getArchiveAsync;
-async function handleUrlSourceAsync(graphqlClient, source) {
+async function handleUrlSourceAsync(ctx, source) {
     const { url } = source;
     if (!validateUrl(url)) {
         log_1.default.error(chalk_1.default.bold(`The URL you provided is invalid: ${url}`));
-        return getArchiveAsync(graphqlClient, {
-            ...source,
+        return getArchiveAsync(ctx, {
             sourceType: ArchiveSourceType.prompt,
         });
     }
     const maybeBuildId = isBuildDetailsPage(url);
     if (maybeBuildId) {
-        if (await askIfUseBuildIdFromUrlAsync(source, maybeBuildId)) {
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+        if (await askIfUseBuildIdFromUrlAsync(ctx, source, maybeBuildId)) {
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.buildId,
                 id: maybeBuildId,
             });
         }
     }
     return {
+        sourceType: ArchiveSourceType.url,
         url,
-        source,
     };
 }
-async function handleLatestSourceAsync(graphqlClient, source) {
+async function handleLatestSourceAsync(ctx) {
     try {
-        const [latestBuild] = await (0, builds_1.getRecentBuildsForSubmissionAsync)(graphqlClient, (0, AppPlatform_1.toAppPlatform)(source.platform), source.projectId);
+        const [latestBuild] = await (0, builds_1.getRecentBuildsForSubmissionAsync)(ctx.graphqlClient, (0, AppPlatform_1.toAppPlatform)(ctx.platform), ctx.projectId);
         if (!latestBuild) {
             log_1.default.error(chalk_1.default.bold("Couldn't find any builds for this project on EAS servers. It looks like you haven't run 'eas build' yet."));
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.prompt,
             });
         }
         return {
+            sourceType: ArchiveSourceType.build,
             build: latestBuild,
-            source,
         };
     }
     catch (err) {
@@ -91,36 +96,38 @@ async function handleLatestSourceAsync(graphqlClient, source) {
         throw err;
     }
 }
-async function handlePathSourceAsync(graphqlClient, source) {
+async function handlePathSourceAsync(ctx, source) {
     if (!(await (0, files_1.isExistingFileAsync)(source.path))) {
         log_1.default.error(chalk_1.default.bold(`${source.path} doesn't exist`));
-        return getArchiveAsync(graphqlClient, {
-            ...source,
+        return getArchiveAsync(ctx, {
             sourceType: ArchiveSourceType.prompt,
         });
     }
-    log_1.default.log('Uploading your app archive to the Expo Submission Service');
-    const uploadUrl = await (0, files_1.uploadAppArchiveAsync)(graphqlClient, source.path);
+    log_1.default.log('Uploading your app archive to EAS Submit');
+    const bucketKey = await (0, files_1.uploadAppArchiveAsync)(ctx.graphqlClient, source.path);
     return {
-        url: uploadUrl,
-        source,
+        sourceType: ArchiveSourceType.gcs,
+        bucketKey,
+        localSource: {
+            sourceType: ArchiveSourceType.path,
+            path: source.path,
+        },
     };
 }
-async function handleBuildIdSourceAsync(graphqlClient, source) {
+async function handleBuildIdSourceAsync(ctx, source) {
     try {
-        const build = await BuildQuery_1.BuildQuery.byIdAsync(graphqlClient, source.id);
-        if (build.platform !== (0, AppPlatform_1.toAppPlatform)(source.platform)) {
-            const expectedPlatformName = platform_1.appPlatformDisplayNames[(0, AppPlatform_1.toAppPlatform)(source.platform)];
+        const build = await BuildQuery_1.BuildQuery.byIdAsync(ctx.graphqlClient, source.id);
+        if (build.platform !== (0, AppPlatform_1.toAppPlatform)(ctx.platform)) {
+            const expectedPlatformName = platform_1.appPlatformDisplayNames[(0, AppPlatform_1.toAppPlatform)(ctx.platform)];
             const receivedPlatformName = platform_1.appPlatformDisplayNames[build.platform];
             log_1.default.error(chalk_1.default.bold(`Build platform doesn't match! Expected ${expectedPlatformName} build but got ${receivedPlatformName}.`));
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.prompt,
             });
         }
         return {
+            sourceType: ArchiveSourceType.build,
             build,
-            source,
         };
     }
     catch (err) {
@@ -128,33 +135,30 @@ async function handleBuildIdSourceAsync(graphqlClient, source) {
         log_1.default.warn('Are you sure that the given ID corresponds to a build from EAS Build?');
         log_1.default.warn(`Build IDs from the classic build service (expo build:[android|ios]) are not supported. ${(0, log_1.learnMore)('https://docs.expo.dev/submit/classic-builds/')}`);
         log_1.default.debug('Original error:', err);
-        return getArchiveAsync(graphqlClient, {
-            ...source,
+        return getArchiveAsync(ctx, {
             sourceType: ArchiveSourceType.prompt,
         });
     }
 }
-async function handleBuildListSourceAsync(graphqlClient, source) {
+async function handleBuildListSourceAsync(ctx) {
     try {
-        const appPlatform = (0, AppPlatform_1.toAppPlatform)(source.platform);
+        const appPlatform = (0, AppPlatform_1.toAppPlatform)(ctx.platform);
         const expiryDate = new Date(); // artifacts expire after 30 days
         expiryDate.setDate(expiryDate.getDate() - 30);
-        const recentBuilds = await (0, builds_1.getRecentBuildsForSubmissionAsync)(graphqlClient, appPlatform, source.projectId, {
+        const recentBuilds = await (0, builds_1.getRecentBuildsForSubmissionAsync)(ctx.graphqlClient, appPlatform, ctx.projectId, {
             limit: exports.BUILD_LIST_ITEM_COUNT,
         });
         if (recentBuilds.length < 1) {
             log_1.default.error(chalk_1.default.bold(`Couldn't find any ${platform_1.appPlatformDisplayNames[appPlatform]} builds for this project on EAS servers. ` +
                 "It looks like you haven't run 'eas build' yet."));
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.prompt,
             });
         }
         if (recentBuilds.every(it => new Date(it.updatedAt) < expiryDate)) {
             log_1.default.error(chalk_1.default.bold('It looks like all of your build artifacts have expired. ' +
                 'EAS keeps your build artifacts only for 30 days.'));
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.prompt,
             });
         }
@@ -171,14 +175,13 @@ async function handleBuildListSourceAsync(graphqlClient, source) {
             warn: 'This artifact has expired',
         });
         if (selectedBuild == null) {
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.prompt,
             });
         }
         return {
+            sourceType: ArchiveSourceType.build,
             build: selectedBuild,
-            source,
         };
     }
     catch (err) {
@@ -207,7 +210,7 @@ function formatBuildChoice(build, expiryDate) {
         disabled: buildDate < expiryDate,
     };
 }
-async function handlePromptSourceAsync(graphqlClient, source) {
+async function handlePromptSourceAsync(ctx) {
     const { sourceType: sourceTypeRaw } = await (0, prompts_1.promptAsync)({
         name: 'sourceType',
         type: 'select',
@@ -231,31 +234,27 @@ async function handlePromptSourceAsync(graphqlClient, source) {
     const sourceType = sourceTypeRaw;
     switch (sourceType) {
         case ArchiveSourceType.url: {
-            const url = await askForArchiveUrlAsync(source.platform);
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            const url = await askForArchiveUrlAsync(ctx.platform);
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.url,
                 url,
             });
         }
         case ArchiveSourceType.path: {
-            const path = await askForArchivePathAsync(source.platform);
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            const path = await askForArchivePathAsync(ctx.platform);
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.path,
                 path,
             });
         }
         case ArchiveSourceType.buildList: {
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.buildList,
             });
         }
         case ArchiveSourceType.buildId: {
             const id = await askForBuildIdAsync();
-            return getArchiveAsync(graphqlClient, {
-                ...source,
+            return getArchiveAsync(ctx, {
                 sourceType: ArchiveSourceType.buildId,
                 id,
             });
@@ -325,11 +324,11 @@ async function askForBuildIdAsync() {
     });
     return id;
 }
-async function askIfUseBuildIdFromUrlAsync(source, buildId) {
+async function askIfUseBuildIdFromUrlAsync(ctx, source, buildId) {
     const { url } = source;
     log_1.default.warn(`It seems that you provided a build details page URL: ${url}`);
     log_1.default.warn('We expected to see the build artifact URL.');
-    if (!source.nonInteractive) {
+    if (!ctx.nonInteractive) {
         const useAsBuildId = await (0, prompts_1.confirmAsync)({
             message: `Do you want to submit build ${buildId} instead?`,
         });

package/build/submit/BaseSubmitter.d.ts

@@ -1,11 +1,13 @@
 import { Platform } from '@expo/eas-build-job';
 import { AnalyticsEvent } from '../analytics/AnalyticsManager';
-import { AndroidSubmissionConfigInput, IosSubmissionConfigInput, SubmissionFragment } from '../graphql/generated';
+import { AndroidSubmissionConfigInput, IosSubmissionConfigInput, SubmissionArchiveSourceInput, SubmissionFragment } from '../graphql/generated';
+import { ResolvedArchiveSource } from './ArchiveSource';
 import { SubmissionContext } from './context';
 export interface SubmissionInput<P extends Platform> {
     projectId: string;
     submissionConfig: P extends Platform.ANDROID ? AndroidSubmissionConfigInput : IosSubmissionConfigInput;
     buildId?: string;
+    archiveSource?: SubmissionArchiveSourceInput;
 }
 interface AnalyticEvents {
     attemptEvent: AnalyticsEvent;
@@ -25,6 +27,7 @@ export default abstract class BaseSubmitter<P extends Platform, ResolvedSourceOp
     private getSourceOptionsAsync;
     submitAsync(): Promise<SubmissionFragment>;
     abstract createSubmissionInputAsync(resolvedOptions: ResolvedSourceOptions): Promise<SubmissionInput<P>>;
+    formatArchive(archive: ResolvedArchiveSource): Pick<SubmissionInput<P>, 'archiveSource' | 'buildId'>;
     private createSubmissionAsync;
     private createSubmissionWithAnalyticsAsync;
     protected abstract createPlatformSubmissionAsync(input: SubmissionInput<P>): Promise<SubmissionFragment>;

package/build/submit/BaseSubmitter.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const common_1 = require("../analytics/common");
+const generated_1 = require("../graphql/generated");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const ora_1 = require("../ora");
 const platform_1 = require("../platform");
+const ArchiveSource_1 = require("./ArchiveSource");
 class BaseSubmitter {
     constructor(ctx, options, sourceOptionResolver, sourceOptionAnalytics) {
         this.ctx = ctx;
@@ -35,6 +37,24 @@ class BaseSubmitter {
         const input = await this.createSubmissionInputAsync(resolvedSourceOptions);
         return await this.createSubmissionWithAnalyticsAsync(input);
     }
+    formatArchive(archive) {
+        switch (archive.sourceType) {
+            case ArchiveSource_1.ArchiveSourceType.url: {
+                return { archiveSource: { type: generated_1.SubmissionArchiveSourceType.Url, url: archive.url } };
+            }
+            case ArchiveSource_1.ArchiveSourceType.gcs: {
+                return {
+                    archiveSource: {
+                        type: generated_1.SubmissionArchiveSourceType.GcsSubmitArchive,
+                        bucketKey: archive.bucketKey,
+                    },
+                };
+            }
+            case ArchiveSource_1.ArchiveSourceType.build: {
+                return { buildId: archive.build.id };
+            }
+        }
+    }
     async createSubmissionAsync(submissionInput) {
         log_1.default.addNewLineIfNone();
         const platformDisplayName = platform_1.appPlatformDisplayNames[(0, AppPlatform_1.toAppPlatform)(this.ctx.platform)];

package/build/submit/android/AndroidSubmitCommand.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const eas_build_job_1 = require("@expo/eas-build-job");
 const eas_json_1 = require("@expo/eas-json");
 const results_1 = require("@expo/results");
 const generated_1 = require("../../graphql/generated");
@@ -81,7 +80,7 @@ class AndroidSubmitCommand {
     }
     resolveArchiveSource() {
         try {
-            return (0, results_1.result)((0, commons_1.resolveArchiveSource)(this.ctx, eas_build_job_1.Platform.ANDROID));
+            return (0, results_1.result)((0, commons_1.resolveArchiveSource)(this.ctx));
         }
         catch (err) {
             return (0, results_1.result)(err);

package/build/submit/android/AndroidSubmitter.d.ts

@@ -1,6 +1,6 @@
 import { Platform } from '@expo/eas-build-job';
 import { AndroidSubmissionConfigInput, SubmissionFragment } from '../../graphql/generated';
-import { Archive, ArchiveSource } from '../ArchiveSource';
+import { ArchiveSource, ResolvedArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
 import { SubmissionContext } from '../context';
 import { ServiceAccountKeyResult, ServiceAccountSource } from './ServiceAccountSource';
@@ -10,13 +10,13 @@ export interface AndroidSubmissionOptions extends Pick<AndroidSubmissionConfigIn
     serviceAccountSource: ServiceAccountSource;
 }
 interface ResolvedSourceOptions {
-    archive: Archive;
+    archive: ResolvedArchiveSource;
     serviceAccountKeyResult: ServiceAccountKeyResult;
 }
 export default class AndroidSubmitter extends BaseSubmitter<Platform.ANDROID, ResolvedSourceOptions, AndroidSubmissionOptions> {
     constructor(ctx: SubmissionContext<Platform.ANDROID>, options: AndroidSubmissionOptions);
     createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.ANDROID>>;
-    protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }: SubmissionInput<Platform.ANDROID>): Promise<SubmissionFragment>;
+    protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, archiveSource, }: SubmissionInput<Platform.ANDROID>): Promise<SubmissionFragment>;
     private formatSubmissionConfig;
     private prepareSummaryData;
 }

package/build/submit/android/AndroidSubmitter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const AnalyticsManager_1 = require("../../analytics/AnalyticsManager");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
@@ -13,7 +14,12 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
     constructor(ctx, options) {
         const sourceOptionsResolver = {
             // eslint-disable-next-line async-protect/async-suffix
-            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)(ctx.graphqlClient, this.options.archiveSource),
+            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)({
+                graphqlClient: ctx.graphqlClient,
+                platform: eas_build_job_1.Platform.ANDROID,
+                projectId: ctx.projectId,
+                nonInteractive: ctx.nonInteractive,
+            }, this.options.archiveSource),
             // eslint-disable-next-line async-protect/async-suffix
             serviceAccountKeyResult: async () => {
                 return await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource);
@@ -34,26 +40,25 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
         super(ctx, options, sourceOptionsResolver, sourceOptionsAnalytics);
     }
     async createSubmissionInputAsync(resolvedSourceOptions) {
-        var _a;
-        const submissionConfig = await this.formatSubmissionConfig(this.options, resolvedSourceOptions);
+        const submissionConfig = this.formatSubmissionConfig(this.options, resolvedSourceOptions);
         (0, summary_1.printSummary)(this.prepareSummaryData(this.options, resolvedSourceOptions), SummaryHumanReadableKeys);
         return {
             projectId: this.options.projectId,
             submissionConfig,
-            buildId: (_a = resolvedSourceOptions.archive.build) === null || _a === void 0 ? void 0 : _a.id,
+            ...this.formatArchive(resolvedSourceOptions.archive),
         };
     }
-    async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }) {
+    async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, archiveSource, }) {
         return await SubmissionMutation_1.SubmissionMutation.createAndroidSubmissionAsync(this.ctx.graphqlClient, {
             appId: projectId,
             config: submissionConfig,
             submittedBuildId: buildId,
+            archiveSource,
         });
     }
-    formatSubmissionConfig(options, { archive, serviceAccountKeyResult }) {
+    formatSubmissionConfig(options, { serviceAccountKeyResult }) {
         const { track, releaseStatus, changesNotSentForReview } = options;
         return {
-            archiveUrl: archive.url,
             track,
             changesNotSentForReview,
             releaseStatus,

package/build/submit/commons.d.ts

@@ -1,4 +1,4 @@
 import { Platform } from '@expo/eas-build-job';
 import { ArchiveSource } from './ArchiveSource';
 import { SubmissionContext } from './context';
-export declare function resolveArchiveSource<T extends Platform>(ctx: SubmissionContext<T>, platform: T): ArchiveSource;
+export declare function resolveArchiveSource<T extends Platform>(ctx: SubmissionContext<T>): ArchiveSource;

package/build/submit/commons.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveArchiveSource = void 0;
 const ArchiveSource_1 = require("./ArchiveSource");
-function resolveArchiveSource(ctx, platform) {
+function resolveArchiveSource(ctx) {
     const { url, path, id, latest } = ctx.archiveFlags;
     const chosenOptions = [url, path, id, latest];
     if (chosenOptions.filter(opt => opt).length > 1) {
@@ -12,18 +12,12 @@ function resolveArchiveSource(ctx, platform) {
         return {
             sourceType: ArchiveSource_1.ArchiveSourceType.url,
             url,
-            platform,
-            projectId: ctx.projectId,
-            nonInteractive: ctx.nonInteractive,
         };
     }
     else if (path) {
         return {
             sourceType: ArchiveSource_1.ArchiveSourceType.path,
             path,
-            platform,
-            projectId: ctx.projectId,
-            nonInteractive: ctx.nonInteractive,
         };
     }
     else if (id) {
@@ -33,17 +27,11 @@ function resolveArchiveSource(ctx, platform) {
         return {
             sourceType: ArchiveSource_1.ArchiveSourceType.buildId,
             id,
-            platform,
-            projectId: ctx.projectId,
-            nonInteractive: ctx.nonInteractive,
         };
     }
     else if (latest) {
         return {
             sourceType: ArchiveSource_1.ArchiveSourceType.latest,
-            platform,
-            projectId: ctx.projectId,
-            nonInteractive: ctx.nonInteractive,
         };
     }
     else if (ctx.nonInteractive) {
@@ -52,9 +40,6 @@ function resolveArchiveSource(ctx, platform) {
     else {
         return {
             sourceType: ArchiveSource_1.ArchiveSourceType.prompt,
-            platform,
-            projectId: ctx.projectId,
-            nonInteractive: ctx.nonInteractive,
         };
     }
 }

package/build/submit/ios/IosSubmitCommand.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const eas_build_job_1 = require("@expo/eas-build-job");
 const results_1 = require("@expo/results");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const getenv_1 = tslib_1.__importDefault(require("getenv"));
@@ -152,7 +151,7 @@ class IosSubmitCommand {
     }
     resolveArchiveSource() {
         try {
-            return (0, results_1.result)((0, commons_1.resolveArchiveSource)(this.ctx, eas_build_job_1.Platform.IOS));
+            return (0, results_1.result)((0, commons_1.resolveArchiveSource)(this.ctx));
         }
         catch (err) {
             return (0, results_1.result)(err);

package/build/submit/ios/IosSubmitter.d.ts

@@ -1,6 +1,6 @@
 import { Platform } from '@expo/eas-build-job';
 import { IosSubmissionConfigInput, SubmissionFragment } from '../../graphql/generated';
-import { Archive, ArchiveSource } from '../ArchiveSource';
+import { ArchiveSource, ResolvedArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
 import { SubmissionContext } from '../context';
 import { AppSpecificPasswordCredentials, AppSpecificPasswordSource } from './AppSpecificPasswordSource';
@@ -14,7 +14,7 @@ export interface IosSubmissionOptions extends Pick<IosSubmissionConfigInput, 'ap
     credentialsServiceSource?: CredentialsServiceSource;
 }
 interface ResolvedSourceOptions {
-    archive: Archive;
+    archive: ResolvedArchiveSource;
     credentials: {
         appSpecificPassword?: AppSpecificPasswordCredentials;
         ascApiKeyResult?: AscApiKeyResult;
@@ -23,7 +23,7 @@ interface ResolvedSourceOptions {
 export default class IosSubmitter extends BaseSubmitter<Platform.IOS, ResolvedSourceOptions, IosSubmissionOptions> {
     constructor(ctx: SubmissionContext<Platform.IOS>, options: IosSubmissionOptions);
     createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.IOS>>;
-    protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }: SubmissionInput<Platform.IOS>): Promise<SubmissionFragment>;
+    protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, archiveSource, }: SubmissionInput<Platform.IOS>): Promise<SubmissionFragment>;
     private formatSubmissionConfig;
     private formatAppSpecificPassword;
     private formatAscApiKeyResult;

package/build/submit/ios/IosSubmitter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const AnalyticsManager_1 = require("../../analytics/AnalyticsManager");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
@@ -15,7 +16,12 @@ class IosSubmitter extends BaseSubmitter_1.default {
     constructor(ctx, options) {
         const sourceOptionsResolver = {
             // eslint-disable-next-line async-protect/async-suffix
-            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)(ctx.graphqlClient, this.options.archiveSource),
+            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)({
+                graphqlClient: ctx.graphqlClient,
+                platform: eas_build_job_1.Platform.IOS,
+                projectId: ctx.projectId,
+                nonInteractive: ctx.nonInteractive,
+            }, this.options.archiveSource),
             // eslint-disable-next-line async-protect/async-suffix
             credentials: async () => {
                 const maybeAppSpecificPassword = this.options.appSpecificPasswordSource
@@ -49,29 +55,28 @@ class IosSubmitter extends BaseSubmitter_1.default {
         super(ctx, options, sourceOptionsResolver, sourceOptionsAnalytics);
     }
     async createSubmissionInputAsync(resolvedSourceOptions) {
-        var _a;
         const submissionConfig = this.formatSubmissionConfig(this.options, resolvedSourceOptions);
         (0, summary_1.printSummary)(this.prepareSummaryData(this.options, resolvedSourceOptions), SummaryHumanReadableKeys);
         return {
             projectId: this.options.projectId,
             submissionConfig,
-            buildId: (_a = resolvedSourceOptions.archive.build) === null || _a === void 0 ? void 0 : _a.id,
+            ...this.formatArchive(resolvedSourceOptions.archive),
         };
     }
-    async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }) {
+    async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, archiveSource, }) {
         return await SubmissionMutation_1.SubmissionMutation.createIosSubmissionAsync(this.ctx.graphqlClient, {
             appId: projectId,
             config: submissionConfig,
             submittedBuildId: buildId,
+            archiveSource,
         });
     }
-    formatSubmissionConfig(options, { archive, credentials }) {
+    formatSubmissionConfig(options, { credentials }) {
         const { appSpecificPassword, ascApiKeyResult } = credentials;
         const { appleIdUsername, ascAppIdentifier } = options;
         return {
             ascAppIdentifier,
             appleIdUsername,
-            archiveUrl: archive.url,
             ...(appSpecificPassword ? this.formatAppSpecificPassword(appSpecificPassword) : null),
             ...((ascApiKeyResult === null || ascApiKeyResult === void 0 ? void 0 : ascApiKeyResult.result) ? this.formatAscApiKeyResult(ascApiKeyResult.result) : null),
         };

package/build/submit/utils/files.js

@@ -18,11 +18,11 @@ async function isExistingFileAsync(filePath) {
 exports.isExistingFileAsync = isExistingFileAsync;
 async function uploadAppArchiveAsync(graphqlClient, path) {
     const fileSize = (await fs_extra_1.default.stat(path)).size;
-    const { url } = await (0, uploads_1.uploadFileAtPathToS3Async)(graphqlClient, generated_1.UploadSessionType.EasSubmitAppArchive, path, (0, progress_1.createProgressTracker)({
+    const bucketKey = await (0, uploads_1.uploadFileAtPathToGCSAsync)(graphqlClient, generated_1.UploadSessionType.EasSubmitGcsAppArchive, path, (0, progress_1.createProgressTracker)({
         total: fileSize,
         message: 'Uploading to EAS Submit',
         completedMessage: 'Uploaded to EAS Submit',
     }));
-    return url;
+    return bucketKey;
 }
 exports.uploadAppArchiveAsync = uploadAppArchiveAsync;

package/build/submit/utils/summary.d.ts

@@ -1,8 +1,8 @@
-import { Archive } from '../ArchiveSource';
+import { ResolvedArchiveSource } from '../ArchiveSource';
 export interface ArchiveSourceSummaryFields {
     archiveUrl?: string;
     archivePath?: string;
     formattedBuild?: string;
 }
-export declare function formatArchiveSourceSummary({ source, build }: Archive): ArchiveSourceSummaryFields;
+export declare function formatArchiveSourceSummary(archive: ResolvedArchiveSource): ArchiveSourceSummaryFields;
 export declare function printSummary<T extends object>(summary: T, keyMap: Record<keyof T, string>): void;

package/build/submit/utils/summary.js

@@ -32,18 +32,17 @@ function formatSubmissionBuildSummary(build) {
             labelFormat: label => `    ${chalk_1.default.dim(label)}:`,
         }));
 }
-function formatArchiveSourceSummary({ source, build }) {
+function formatArchiveSourceSummary(archive) {
     const summarySlice = {};
-    switch (source.sourceType) {
-        case ArchiveSource_1.ArchiveSourceType.path:
-            summarySlice.archivePath = source.path;
+    switch (archive.sourceType) {
+        case ArchiveSource_1.ArchiveSourceType.gcs:
+            summarySlice.archivePath = archive.localSource.path;
             break;
         case ArchiveSource_1.ArchiveSourceType.url:
-            summarySlice.archiveUrl = source.url;
+            summarySlice.archiveUrl = archive.url;
             break;
-        case ArchiveSource_1.ArchiveSourceType.buildId:
-        case ArchiveSource_1.ArchiveSourceType.latest:
-            summarySlice.formattedBuild = formatSubmissionBuildSummary(build);
+        case ArchiveSource_1.ArchiveSourceType.build:
+            summarySlice.formattedBuild = formatSubmissionBuildSummary(archive.build);
             break;
     }
     return summarySlice;