fix: set DEPLOY_ID and DEPLOY_URL env vars once available (#6489)

netlify · Apr 8, 2024 · bc24f77 · bc24f77 · github-actions · Apr 8, 2024
1 parent edbfbb4
commit bc24f77
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/commands/deploy/deploy.ts b/src/commands/deploy/deploy.ts
@@ -436,7 +436,15 @@ const runDeploy = async ({
 }: {
   functionsFolder?: string
   command: BaseCommand
-}) => {
+}): Promise<{
+  siteId: string
+  siteName: string
+  deployId: string
+  siteUrl: string
+  deployUrl: string
+  logsUrl: string
+  functionLogsUrl: string
+}> => {
   let results
   let deployId
 
@@ -831,7 +839,7 @@ export const deploy = async (options: OptionValues, command: BaseCommand) => {
   // @ts-expect-error TS(2339) FIXME: Property 'published_deploy' does not exist on type... Remove this comment to see the full error message
   const deployToProduction = options.prod || (options.prodIfUnlocked && !siteData.published_deploy.locked)
 
-  let results = {}
+  let results = {} as Awaited<ReturnType<typeof prepAndRunDeploy>>
 
   if (options.build) {
     await handleBuild({
@@ -853,7 +861,7 @@ export const deploy = async (options: OptionValues, command: BaseCommand) => {
           deployToProduction,
         })
 
-        return {}
+        return { newEnvChanges: { DEPLOY_ID: results.deployId, DEPLOY_URL: results.deployUrl } }
       },
     })
   } else {
@@ -880,7 +888,6 @@ export const deploy = async (options: OptionValues, command: BaseCommand) => {
   })
 
   if (options.open) {
-    // @ts-expect-error TS(2339) FIXME: Property 'siteUrl' does not exist on type '{}'.
     const urlToOpen = deployToProduction ? results.siteUrl : results.deployUrl
     // @ts-expect-error TS(2345) FIXME: Argument of type '{ url: any; }' is not assignable... Remove this comment to see the full error message
     await openBrowser({ url: urlToOpen })

diff --git a/tests/integration/commands/deploy/deploy.test.js b/tests/integration/commands/deploy/deploy.test.js
@@ -221,6 +221,18 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
         .withNetlifyToml({
           config: {
             build: { publish: 'public' },
+            plugins: [{ package: './plugins/log-env' }],
+          },
+        })
+        .withBuildPlugin({
+          name: 'log-env',
+          plugin: {
+            async onSuccess() {
+              // eslint-disable-next-line n/global-require, no-undef
+              const { DEPLOY_ID, DEPLOY_URL } = require('process').env
+              console.log(`DEPLOY_ID: ${DEPLOY_ID}`)
+              console.log(`DEPLOY_URL: ${DEPLOY_URL}`)
+            },
           },
         })
 
@@ -232,6 +244,10 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
       })
 
       t.expect(output.includes('Netlify Build completed in')).toBe(true)
+      const [, deployId] = output.match(/DEPLOY_ID: (\w+)/)
+      const [, deployURL] = output.match(/DEPLOY_URL: (.+)/)
+      t.expect(deployId).not.toEqual('0')
+      t.expect(deployURL).toContain(`https://${deployId}--`)
     })
   })