fix(apps): use app_builder_url from API response instead of constructing it

The backend now returns app_builder_url in upload and release responses,
which reflects the correct host for orgs with custom domains (e.g.
dd.datad0g.com). The previous hardcoded https://app.${site}/... produced
wrong URLs for those orgs.

The upload response's URL includes ?viewMode=preview (edit view); the
release response's URL does not (published view) — this matches the
backend behavior in ddoghq/dd-source#1038.

Guards the release log against a missing/null app_builder_url (e.g. an
older backend during a coordinated rollout) so it degrades to the plain
"Published ... to live." message instead of crashing or logging
"undefined" — mirrors the existing guard on the upload log.

Related: ddoghq/dd-source#1038

Author: tyffical

packages/plugins/apps/src/upload.test.ts

@@ -229,6 +229,8 @@ describe('Apps Plugin - upload', () => {
                 version_id: 'v123',
                 application_id: 'app123',
                 app_builder_id: 'builder123',
+                app_builder_url:
+                    'https://app.datadoghq.com/app-builder/apps/edit/builder123?viewMode=preview',
             } as any);
 
             const { errors, warnings } = await uploadArchive(archive, context, logger);
@@ -248,7 +250,30 @@ describe('Apps Plugin - upload', () => {
                 onRetry: expect.any(Function),
             });
             expect(mockLogFn).toHaveBeenCalledWith(
-                expect.stringContaining('Your application is available at'),
+                expect.stringContaining(
+                    'https://app.datadoghq.com/app-builder/apps/edit/builder123?viewMode=preview',
+                ),
+                'info',
+            );
+        });
+
+        test('Should use app_builder_url from upload response', async () => {
+            doAuthenticatedRequestMock.mockResolvedValueOnce({
+                version_id: 'v123',
+                application_id: 'app123',
+                app_builder_id: 'builder123',
+                app_builder_url:
+                    'https://dd.datad0g.com/app-builder/apps/edit/builder123?viewMode=preview',
+            } as any);
+
+            await uploadArchive(archive, context, logger);
+
+            // Uses the exact URL from the response — proves it's not reconstructed from
+            // context.site (datadoghq.com), which would produce a different domain.
+            expect(mockLogFn).toHaveBeenCalledWith(
+                expect.stringContaining(
+                    'https://dd.datad0g.com/app-builder/apps/edit/builder123?viewMode=preview',
+                ),
                 'info',
             );
         });
@@ -258,6 +283,8 @@ describe('Apps Plugin - upload', () => {
                 version_id: 'v123',
                 application_id: 'app123',
                 app_builder_id: 'builder123',
+                app_builder_url:
+                    'https://app.datadoghq.com/app-builder/apps/edit/builder123?viewMode=preview',
             } as any);
 
             const { errors, warnings } = await uploadArchive(
@@ -286,8 +313,12 @@ describe('Apps Plugin - upload', () => {
                     version_id: 'v123',
                     application_id: 'app123',
                     app_builder_id: 'builder123',
+                    app_builder_url:
+                        'https://app.datadoghq.com/app-builder/apps/edit/builder123?viewMode=preview',
                 })
-                .mockResolvedValueOnce({});
+                .mockResolvedValueOnce({
+                    app_builder_url: 'https://app.datadoghq.com/app-builder/apps/builder123',
+                });
 
             const { errors, warnings } = await uploadArchive(archive, context, logger);
 
@@ -301,10 +332,72 @@ describe('Apps Plugin - upload', () => {
                 getData: expect.any(Function),
                 onRetry: expect.any(Function),
             });
-            expect(mockLogFn).toHaveBeenCalledWith(
-                expect.stringContaining('Your application is available at'),
-                'info',
+            // Pin down which log is which by its distinguishing message prefix — proves not
+            // just that a matching call exists somewhere, but that the upload log specifically
+            // carries ?viewMode=preview and the release log specifically doesn't.
+            const uploadLog = mockLogFn.mock.calls.find(([message]) =>
+                message.startsWith('Your application is available at'),
+            );
+            const releaseLog = mockLogFn.mock.calls.find(([message]) =>
+                message.startsWith('Published uploaded version'),
+            );
+            expect(uploadLog?.[0]).toContain(
+                'https://app.datadoghq.com/app-builder/apps/edit/builder123?viewMode=preview',
+            );
+            expect(releaseLog?.[0]).toContain(
+                'https://app.datadoghq.com/app-builder/apps/builder123',
+            );
+            expect(releaseLog?.[0]).not.toContain('?viewMode');
+        });
+
+        test('Should use app_builder_url from release response', async () => {
+            doAuthenticatedRequestMock
+                .mockResolvedValueOnce({
+                    version_id: 'v123',
+                    application_id: 'app123',
+                    app_builder_id: 'builder123',
+                    app_builder_url:
+                        'https://dd.datad0g.com/app-builder/apps/edit/builder123?viewMode=preview',
+                })
+                .mockResolvedValueOnce({
+                    app_builder_url: 'https://dd.datad0g.com/app-builder/apps/builder123',
+                });
+
+            await uploadArchive(archive, context, logger);
+
+            // Match the release log by its distinguishing message prefix — proves the
+            // published URL reflects the custom domain from the release response (not
+            // context.site) and carries no ?viewMode (unlike the upload log).
+            const releaseLog = mockLogFn.mock.calls.find(([message]) =>
+                message.startsWith('Published uploaded version'),
+            );
+            expect(releaseLog?.[0]).toContain('https://dd.datad0g.com/app-builder/apps/builder123');
+            expect(releaseLog?.[0]).not.toContain('?viewMode');
+        });
+
+        test('Should degrade gracefully when release response has no app_builder_url', async () => {
+            doAuthenticatedRequestMock
+                .mockResolvedValueOnce({
+                    version_id: 'v123',
+                    application_id: 'app123',
+                    app_builder_id: 'builder123',
+                    app_builder_url:
+                        'https://app.datadoghq.com/app-builder/apps/edit/builder123?viewMode=preview',
+                })
+                // Simulates an older backend that doesn't yet return app_builder_url.
+                .mockResolvedValueOnce({});
+
+            const { errors, warnings } = await uploadArchive(archive, context, logger);
+
+            expect(errors).toHaveLength(0);
+            expect(warnings).toHaveLength(0);
+            const releaseLog = mockLogFn.mock.calls.find(([message]) =>
+                message.startsWith('Published uploaded version'),
             );
+            expect(releaseLog?.[0]).toContain('to live.');
+            // No second line with a URL — degrades to the plain message instead of
+            // logging "undefined" or throwing on a missing app_builder_url.
+            expect(releaseLog?.[0]).not.toContain('\n');
         });
 
         test.each(['false', '0', 'False', 'FALSE', 'off', 'no'])(
@@ -317,6 +410,8 @@ describe('Apps Plugin - upload', () => {
                     version_id: 'v123',
                     application_id: 'app123',
                     app_builder_id: 'builder123',
+                    app_builder_url:
+                        'https://app.datadoghq.com/app-builder/apps/edit/builder123?viewMode=preview',
                 });
 
                 const { errors } = await uploadArchive(archive, context, logger);
@@ -342,6 +437,8 @@ describe('Apps Plugin - upload', () => {
                 version_id: 'v123',
                 application_id: 'app123',
                 app_builder_id: 'builder123',
+                app_builder_url:
+                    'https://app.datadoghq.com/app-builder/apps/edit/builder123?viewMode=preview',
             });
 
             const { errors, warnings } = await uploadArchive(archive, context, logger);

packages/plugins/apps/src/upload.ts

@@ -121,17 +121,15 @@ Would have uploaded ${summary}`,
 
         log.debug(`Uploaded ${summary}\n`);
 
-        if (response.app_builder_id) {
-            const appBuilderUrl = `https://app.${context.site}/app-builder/apps/${response.app_builder_id}`;
-
-            log.info(`Your application is available at:\n  ${cyan(appBuilderUrl)}`);
+        if (response.app_builder_url) {
+            log.info(`Your application is available at:\n  ${cyan(response.app_builder_url)}`);
         }
 
         const shouldPublish = parseBoolEnv(getDDEnvValue('APPS_PUBLISH'), true);
 
         if (response.version_id && shouldPublish) {
             const releaseUrl = getReleaseUrl(context.site, context.identifier);
-            await doAuthenticatedRequest({
+            const releaseResponse: any = await doAuthenticatedRequest({
                 url: releaseUrl,
                 method: 'PUT',
                 type: 'json',
@@ -150,7 +148,14 @@ Would have uploaded ${summary}`,
                     log.warn(message);
                 },
             });
-            log.info(`Published uploaded version ${bold(response.version_id)} to live.`);
+
+            if (releaseResponse?.app_builder_url) {
+                log.info(
+                    `Published uploaded version ${bold(response.version_id)} to live.\n  ${cyan(releaseResponse.app_builder_url)}`,
+                );
+            } else {
+                log.info(`Published uploaded version ${bold(response.version_id)} to live.`);
+            }
         } else if (response.version_id && !shouldPublish) {
             log.info(`Uploaded version ${bold(response.version_id)} as a draft (publish skipped).`);
         }