Fix expiration date check for build list source (#2406)

expo · Jun 4, 2024 · 3093691 · 3093691
1 parent a0606ad
commit 3093691
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes
 
 - Use the correct app config for no GitHub flow in `init:onboarding`. ([#2397](https://github.com/expo/eas-cli/pull/2397) by [@szdziedzic](https://github.com/szdziedzic))
+- Disallow picking expired builds as submit archive source. ([#2406](https://github.com/expo/eas-cli/pull/2406) by [@sjchmiela](https://github.com/sjchmiela))
 
 ### 🧹 Chores
 

diff --git a/packages/eas-cli/src/submit/ArchiveSource.ts b/packages/eas-cli/src/submit/ArchiveSource.ts
@@ -270,8 +270,6 @@ async function handleBuildListSourceAsync(
 ): Promise<ResolvedArchiveSource> {
   try {
     const appPlatform = toAppPlatform(ctx.platform);
-    const expiryDate = new Date(); // artifacts expire after 30 days
-    expiryDate.setDate(expiryDate.getDate() - 30);
 
     const recentBuilds = await getRecentBuildsForSubmissionAsync(
       ctx.graphqlClient,
@@ -294,7 +292,7 @@ async function handleBuildListSourceAsync(
       });
     }
 
-    if (recentBuilds.every(it => new Date(it.updatedAt) < expiryDate)) {
+    if (recentBuilds.every(it => new Date(it.expirationDate) <= new Date())) {
       Log.error(
         chalk.bold(
           'It looks like all of your build artifacts have expired. ' +
@@ -306,7 +304,7 @@ async function handleBuildListSourceAsync(
       });
     }
 
-    const choices = recentBuilds.map(build => formatBuildChoice(build, expiryDate));
+    const choices = recentBuilds.map(build => formatBuildChoice(build));
     choices.push({
       title: 'None of the above (select another option)',
       value: null,
@@ -336,7 +334,7 @@ async function handleBuildListSourceAsync(
   }
 }
 
-function formatBuildChoice(build: BuildFragment, expiryDate: Date): prompts.Choice {
+function formatBuildChoice(build: BuildFragment): prompts.Choice {
   const {
     id,
     updatedAt,
@@ -380,7 +378,7 @@ function formatBuildChoice(build: BuildFragment, expiryDate: Date): prompts.Choi
     title,
     description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
     value: build,
-    disabled: buildDate < expiryDate,
+    disabled: new Date(build.expirationDate) < new Date(),
   };
 }
 

diff --git a/packages/eas-cli/src/submit/__tests__/ArchiveSource-test.ts b/packages/eas-cli/src/submit/__tests__/ArchiveSource-test.ts
@@ -273,7 +273,9 @@ describe(getArchiveAsync, () => {
     jest.mocked(getRecentBuildsForSubmissionAsync).mockResolvedValueOnce([
       {
         ...MOCK_BUILD_FRAGMENT,
-        updatedAt: new Date(Date.now() - 31 * 24 * 3600 * 1000),
+        // We're setting expirationDate to be in the past,
+        // because we want to build to appear expired.
+        expirationDate: new Date(Date.now() - 31 * 24 * 3600 * 1000),
       } as BuildFragment,
     ]);
     jest