@lightdash/cli 2.603.1 → 2.603.3

package/dist/handlers/preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/handlers/preview.ts"],"names":[],"mappings":"AACA,OAAO,EACH,+BAA+B,EAQlC,MAAM,mBAAmB,CAAC;AAoB3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAalD,KAAK,qBAAqB,GAAG,iBAAiB,GAAG;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,+BAA+B,CAAC;IACpD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAoBF,KAAK,yBAAyB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AA2GF,eAAO,MAAM,cAAc,oBACN,qBAAqB,KACvC,OAAO,CAAC,IAAI,CAoTd,CAAC;AAiHF,eAAO,MAAM,mBAAmB,oBACX,qBAAqB,KACvC,OAAO,CAAC,IAAI,CAiNd,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAClB,yBAAyB,KACnC,OAAO,CAAC,IAAI,CA2Cd,CAAC"}
+{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/handlers/preview.ts"],"names":[],"mappings":"AACA,OAAO,EACH,+BAA+B,EAUlC,MAAM,mBAAmB,CAAC;AAoB3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAalD,KAAK,qBAAqB,GAAG,iBAAiB,GAAG;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,kBAAkB,EAAE,+BAA+B,CAAC;IACpD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAoBF,KAAK,yBAAyB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AA2QF,eAAO,MAAM,cAAc,oBACN,qBAAqB,KACvC,OAAO,CAAC,IAAI,CAwWd,CAAC;AAEF,eAAO,MAAM,mBAAmB,oBACX,qBAAqB,KACvC,OAAO,CAAC,IAAI,CA2Qd,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAClB,yBAAyB,KACnC,OAAO,CAAC,IAAI,CA2Cd,CAAC"}

package/dist/handlers/preview.js

@@ -104,6 +104,108 @@ const getPreviewProject = async (name) => {
     });
     return projects.find((project) => project.type === common_1.ProjectType.PREVIEW && project.name === name);
 };
+const withCurrentSettings = (credentials, current) => {
+    if (!current || current.type !== credentials.type)
+        return credentials;
+    const defined = Object.fromEntries(Object.entries(credentials).filter(([, value]) => value !== undefined));
+    return { ...current, ...defined };
+};
+const resolveSourceConnection = async (project, sourceOption, upstreamProjectUuid) => {
+    if (project.connectionRoute !== 'multi') {
+        return { sourceUuid: undefined, connection: { kind: 'primary' } };
+    }
+    const sourceUuid = await (0, sourceSelection_1.resolveProjectSourceUuid)(project.projectUuid, sourceOption, upstreamProjectUuid);
+    if (!sourceUuid)
+        return { sourceUuid, connection: { kind: 'primary' } };
+    let bindings;
+    try {
+        bindings = await (0, apiClient_1.lightdashApi)({
+            method: 'GET',
+            url: `/api/v1/projects/${project.projectUuid}/warehouse-connections/dbt-sources/bindings`,
+            body: undefined,
+        });
+    }
+    catch {
+        return { sourceUuid, connection: { kind: 'unknown', sourceUuid } };
+    }
+    const boundConnectionUuid = bindings.sources.find((item) => item.projectDbtSourceUuid === sourceUuid)?.warehouseConnectionUuid ?? null;
+    if (boundConnectionUuid === null) {
+        return { sourceUuid, connection: { kind: 'primary' } };
+    }
+    const boundConnection = bindings.connections.find((item) => item.warehouseConnectionUuid === boundConnectionUuid);
+    if (!boundConnection) {
+        return { sourceUuid, connection: { kind: 'unknown', sourceUuid } };
+    }
+    return {
+        sourceUuid,
+        connection: boundConnection.isOriginal
+            ? { kind: 'primary' }
+            : { kind: 'extra', connection: boundConnection },
+    };
+};
+// Credentials resolved locally (AWS SSO, Snowflake SSO) expire, so a re-run
+// with the same name pushes freshly resolved ones into the existing preview.
+const refreshPreviewWarehouseCredentials = async (projectUuid, options, upstreamProjectUuid) => {
+    const source = (0, warehouseConnection_1.getWarehouseCredentialsSource)(options);
+    if (source.source === 'organization') {
+        globalState_1.default.debug(`> Preview uses organization warehouse credentials "${source.name}", nothing to refresh`);
+        return;
+    }
+    if (source.source === 'none') {
+        globalState_1.default.debug('> Skipping warehouse credentials refresh (--no-warehouse-credentials)');
+        return;
+    }
+    const loaded = await (0, createProject_1.loadWarehouseCredentialsFromProfiles)({
+        projectDir: options.projectDir,
+        profilesDir: options.profilesDir,
+        target: options.target,
+        profile: options.profile,
+        startOfWeek: options.startOfWeek,
+        assumeYes: options.assumeYes,
+        targetPath: options.targetPath,
+    });
+    if (!loaded) {
+        console.error(styles.warning('Keeping the warehouse credentials already stored on the preview.'));
+        return;
+    }
+    const project = await (0, refresh_1.getProject)(projectUuid);
+    const { connection: sourceConnection } = await resolveSourceConnection(project, options.source, upstreamProjectUuid);
+    if (sourceConnection.kind === 'unknown') {
+        console.error(styles.warning(`Could not read which connection source ${options.source ?? sourceConnection.sourceUuid} uses; keeping the warehouse credentials already stored on the preview.`));
+        return;
+    }
+    const connection = sourceConnection.kind === 'extra'
+        ? sourceConnection.connection
+        : undefined;
+    const spinner = globalState_1.default.startSpinner(connection
+        ? `  Refreshing warehouse credentials for "${connection.name}"...`
+        : '  Refreshing warehouse credentials...');
+    try {
+        if (connection) {
+            const current = await (0, apiClient_1.lightdashApi)({
+                method: 'GET',
+                url: `/api/v1/projects/${projectUuid}/warehouse-connections/${connection.warehouseConnectionUuid}`,
+                body: undefined,
+            });
+            const body = {
+                warehouseConnection: withCurrentSettings(loaded.credentials, current.warehouseConnection),
+            };
+            await (0, apiClient_1.lightdashApi)({
+                method: 'PATCH',
+                url: `/api/v1/projects/${projectUuid}/warehouse-connections/${connection.warehouseConnectionUuid}`,
+                body: JSON.stringify(body),
+            });
+        }
+        else {
+            await (0, warehouseConnection_1.updateProjectWarehouseConnection)(project, loaded.credentials, 'Refreshing warehouse credentials');
+        }
+        spinner.succeed('  Warehouse credentials refreshed');
+    }
+    catch (e) {
+        spinner.fail();
+        throw e;
+    }
+};
 const previewHandler = async (originalOptions) => {
     (0, credentials_1.refuseAgentConnection)();
     const options = { ...originalOptions };
@@ -144,10 +246,11 @@ const previewHandler = async (originalOptions) => {
     options.combineManifestProjectUuid = config.context?.project;
     // Validate upstream project before attempting to copy permissions or content
     let upstreamProjectValid = false;
+    let upstreamProject;
     if (config.context?.project) {
         try {
             globalState_1.default.debug(`> Validating upstream project: ${config.context.project}`);
-            const upstreamProject = await (0, apiClient_1.lightdashApi)({
+            upstreamProject = await (0, apiClient_1.lightdashApi)({
                 method: 'GET',
                 url: `/api/v1/projects/${config.context.project}`,
                 body: undefined,
@@ -179,16 +282,29 @@ const previewHandler = async (originalOptions) => {
     else if (upstreamProjectValid) {
         console.error(`\n${styles.success('✔')}   Copying charts and dashboards from "${config.context?.projectName || 'source project'}"`);
     }
+    const upstreamProjectUuid = config.context?.project && upstreamProjectValid
+        ? config.context.project
+        : undefined;
+    const upstreamSourceConnection = upstreamProject &&
+        upstreamProjectUuid &&
+        projectTypeConfig.warehouseCredentials !== false &&
+        (0, warehouseConnection_1.getWarehouseCredentialsSource)({
+            ...options,
+            warehouseCredentials: projectTypeConfig.warehouseCredentials,
+        }).source === 'profiles'
+        ? (await resolveSourceConnection(upstreamProject, options.source, upstreamProjectUuid)).connection
+        : { kind: 'primary' };
+    const keepsUpstreamPrimary = upstreamSourceConnection.kind !== 'primary';
     try {
         const results = await (0, createProject_1.createProject)({
             ...options,
             name,
             type: common_1.ProjectType.PREVIEW,
-            upstreamProjectUuid: config.context?.project && upstreamProjectValid
-                ? config.context.project
-                : undefined,
+            upstreamProjectUuid,
             copyContent: !options.skipCopyContent && upstreamProjectValid,
-            warehouseCredentials: projectTypeConfig.warehouseCredentials,
+            warehouseCredentials: keepsUpstreamPrimary
+                ? false
+                : projectTypeConfig.warehouseCredentials,
             expiresIn: options.expiresIn
                 ? parseInt(options.expiresIn, 10)
                 : undefined,
@@ -212,11 +328,6 @@ const previewHandler = async (originalOptions) => {
         }
         return;
     }
-    if (options.disableTimestampConversion === undefined) {
-        options.disableTimestampConversion =
-            (0, timestampConversion_1.getDisableTimestampConversionFromProject)(project.warehouseConnection);
-        globalState_1.default.debug(`> Using disable-timestamp-conversion=${String(options.disableTimestampConversion ?? false)} from preview project settings`);
-    }
     const previewStartTime = Date.now();
     await analytics_1.LightdashAnalytics.track({
         event: 'preview.started',
@@ -226,6 +337,24 @@ const previewHandler = async (originalOptions) => {
         },
     });
     try {
+        if (keepsUpstreamPrimary) {
+            await refreshPreviewWarehouseCredentials(project.projectUuid, {
+                ...options,
+                warehouseCredentials: projectTypeConfig.warehouseCredentials,
+            }, upstreamProjectUuid);
+        }
+        const previewSource = upstreamProjectUuid
+            ? await resolveSourceConnection(await (0, refresh_1.getProject)(project.projectUuid), options.source, upstreamProjectUuid)
+            : undefined;
+        if (options.disableTimestampConversion === undefined &&
+            previewSource?.connection.kind === 'extra') {
+            options.disableTimestampConversion = (await (0, timestampConversion_1.getProjectDeploySettings)(undefined, project.projectUuid, previewSource.sourceUuid)).disableTimestampConversion;
+        }
+        else if (options.disableTimestampConversion === undefined) {
+            options.disableTimestampConversion =
+                (0, timestampConversion_1.getDisableTimestampConversionFromProject)(project.warehouseConnection);
+            globalState_1.default.debug(`> Using disable-timestamp-conversion=${String(options.disableTimestampConversion ?? false)} from preview project settings`);
+        }
         const { explores, isProjectComplete } = await (0, compile_1.compileProject)(options);
         await (0, deploy_1.deploy)(explores, {
             ...options,
@@ -320,86 +449,6 @@ const previewHandler = async (originalOptions) => {
     await cleanupProject(executionId, project.projectUuid, previewStartTime);
 };
 exports.previewHandler = previewHandler;
-// Credentials resolved locally (AWS SSO, Snowflake SSO) expire, so a re-run
-// with the same name pushes freshly resolved ones into the existing preview.
-const refreshPreviewWarehouseCredentials = async (projectUuid, options, upstreamProjectUuid) => {
-    const source = (0, warehouseConnection_1.getWarehouseCredentialsSource)(options);
-    if (source.source === 'organization') {
-        globalState_1.default.debug(`> Preview uses organization warehouse credentials "${source.name}", nothing to refresh`);
-        return;
-    }
-    if (source.source === 'none') {
-        globalState_1.default.debug('> Skipping warehouse credentials refresh (--no-warehouse-credentials)');
-        return;
-    }
-    const loaded = await (0, createProject_1.loadWarehouseCredentialsFromProfiles)({
-        projectDir: options.projectDir,
-        profilesDir: options.profilesDir,
-        target: options.target,
-        profile: options.profile,
-        startOfWeek: options.startOfWeek,
-        assumeYes: options.assumeYes,
-        targetPath: options.targetPath,
-    });
-    if (!loaded) {
-        console.error(styles.warning('Keeping the warehouse credentials already stored on the preview.'));
-        return;
-    }
-    const project = await (0, refresh_1.getProject)(projectUuid);
-    let connection;
-    if (project.connectionRoute === 'multi') {
-        const sourceUuid = await (0, sourceSelection_1.resolveProjectSourceUuid)(projectUuid, options.source, upstreamProjectUuid);
-        if (sourceUuid) {
-            const keepStoredCredentials = () => console.error(styles.warning(`Could not read which connection source ${options.source ?? sourceUuid} uses; keeping the warehouse credentials already stored on the preview.`));
-            let bindings;
-            try {
-                bindings = await (0, apiClient_1.lightdashApi)({
-                    method: 'GET',
-                    url: `/api/v1/projects/${projectUuid}/warehouse-connections/dbt-sources/bindings`,
-                    body: undefined,
-                });
-            }
-            catch {
-                keepStoredCredentials();
-                return;
-            }
-            const boundConnectionUuid = bindings.sources.find((item) => item.projectDbtSourceUuid === sourceUuid)?.warehouseConnectionUuid ?? null;
-            if (boundConnectionUuid !== null) {
-                const boundConnection = bindings.connections.find((item) => item.warehouseConnectionUuid === boundConnectionUuid);
-                if (!boundConnection) {
-                    keepStoredCredentials();
-                    return;
-                }
-                connection = boundConnection.isOriginal
-                    ? undefined
-                    : boundConnection;
-            }
-        }
-    }
-    const spinner = globalState_1.default.startSpinner(connection
-        ? `  Refreshing warehouse credentials for "${connection.name}"...`
-        : '  Refreshing warehouse credentials...');
-    try {
-        if (connection) {
-            const body = {
-                warehouseConnection: loaded.credentials,
-            };
-            await (0, apiClient_1.lightdashApi)({
-                method: 'PATCH',
-                url: `/api/v1/projects/${projectUuid}/warehouse-connections/${connection.warehouseConnectionUuid}`,
-                body: JSON.stringify(body),
-            });
-        }
-        else {
-            await (0, warehouseConnection_1.updateProjectWarehouseConnection)(project, loaded.credentials, 'Refreshing warehouse credentials');
-        }
-        spinner.succeed('  Warehouse credentials refreshed');
-    }
-    catch (e) {
-        spinner.fail();
-        throw e;
-    }
-};
 const startPreviewHandler = async (originalOptions) => {
     (0, credentials_1.refuseAgentConnection)();
     const options = { ...originalOptions };
@@ -447,7 +496,10 @@ const startPreviewHandler = async (originalOptions) => {
             warehouseCredentials: projectTypeConfig.warehouseCredentials,
         }, config.context?.project);
         // Update
-        const previewSettings = await (0, timestampConversion_1.getProjectDeploySettings)(options.disableTimestampConversion, previewProject.projectUuid, undefined);
+        const previewSource = await resolveSourceConnection(await (0, refresh_1.getProject)(previewProject.projectUuid), options.source, config.context?.project);
+        const previewSettings = await (0, timestampConversion_1.getProjectDeploySettings)(options.disableTimestampConversion, previewProject.projectUuid, previewSource.connection.kind === 'unknown'
+            ? undefined
+            : previewSource.sourceUuid);
         options.disableTimestampConversion =
             previewSettings.disableTimestampConversion;
         const { explores, isProjectComplete } = await (0, compile_1.compileProject)(options);
@@ -478,14 +530,26 @@ const startPreviewHandler = async (originalOptions) => {
         else {
             console.error(`\n${styles.success('✔')}   Copying charts and dashboards from "${config.context?.projectName || 'source project'}"`);
         }
+        const upstreamProjectUuid = config.context?.project;
+        const upstreamSourceConnection = upstreamProjectUuid &&
+            projectTypeConfig.warehouseCredentials !== false &&
+            (0, warehouseConnection_1.getWarehouseCredentialsSource)({
+                ...options,
+                warehouseCredentials: projectTypeConfig.warehouseCredentials,
+            }).source === 'profiles'
+            ? (await resolveSourceConnection(await (0, refresh_1.getProject)(upstreamProjectUuid), options.source, upstreamProjectUuid)).connection
+            : { kind: 'primary' };
+        const keepsUpstreamPrimary = upstreamSourceConnection.kind !== 'primary';
         // Create
         const results = await (0, createProject_1.createProject)({
             ...options,
             name: projectName,
             type: common_1.ProjectType.PREVIEW,
-            upstreamProjectUuid: config.context?.project,
+            upstreamProjectUuid,
             copyContent: !options.skipCopyContent,
-            warehouseCredentials: projectTypeConfig.warehouseCredentials,
+            warehouseCredentials: keepsUpstreamPrimary
+                ? false
+                : projectTypeConfig.warehouseCredentials,
             expiresIn: options.expiresIn
                 ? parseInt(options.expiresIn, 10)
                 : undefined,
@@ -510,7 +574,20 @@ const startPreviewHandler = async (originalOptions) => {
                 name: options.name,
             },
         });
-        if (options.disableTimestampConversion === undefined) {
+        if (keepsUpstreamPrimary) {
+            await refreshPreviewWarehouseCredentials(project.projectUuid, {
+                ...options,
+                warehouseCredentials: projectTypeConfig.warehouseCredentials,
+            }, upstreamProjectUuid);
+        }
+        const previewSource = upstreamProjectUuid
+            ? await resolveSourceConnection(await (0, refresh_1.getProject)(project.projectUuid), options.source, upstreamProjectUuid)
+            : undefined;
+        if (options.disableTimestampConversion === undefined &&
+            previewSource?.connection.kind === 'extra') {
+            options.disableTimestampConversion = (await (0, timestampConversion_1.getProjectDeploySettings)(undefined, project.projectUuid, previewSource.sourceUuid)).disableTimestampConversion;
+        }
+        else if (options.disableTimestampConversion === undefined) {
             options.disableTimestampConversion =
                 (0, timestampConversion_1.getDisableTimestampConversionFromProject)(project.warehouseConnection);
             globalState_1.default.debug(`> Using disable-timestamp-conversion=${String(options.disableTimestampConversion ?? false)} from preview project settings`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "2.603.1",
+  "version": "2.603.3",
   "description": "Lightdash CLI tool",
   "license": "MIT",
   "repository": {
@@ -22,8 +22,8 @@
     "@actions/core": "1.11.1",
     "@aws-sdk/credential-providers": "3.995.0",
     "@casl/ability": "6.8.0",
-    "@lightdash/common": "2.603.1",
-    "@lightdash/warehouses": "2.603.1",
+    "@lightdash/common": "2.603.3",
+    "@lightdash/warehouses": "2.603.3",
     "@sidvind/better-ajv-errors": "7.0.0",
     "@types/columnify": "1.5.1",
     "ajv": "8.18.0",