fix(output): fix output when validation errors

Add details to the markdown file, when a package fails to validate
dxatscale · Oct 4, 2023 · da88e75 · da88e75
1 parent 690de5c
commit da88e75
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 21 deletions.
diff --git a/packages/sfpowerscripts-cli/src/impl/deploy/DeployImpl.ts b/packages/sfpowerscripts-cli/src/impl/deploy/DeployImpl.ts
@@ -200,7 +200,7 @@ export default class DeployImpl {
                                 await this.promotePackagesBeforeInstallation(packageInfo.sourceDirectory, sfpPackage);
                             } catch (error) {
                                 //skip packages already promoted
-                                SFPLogger.log(`Package already promoted .. skipping`,LoggerLevel.INFO);
+                                SFPLogger.log(`Package already promoted .. skipping`,LoggerLevel.WARN);
                             }
 
                             this.displayRetryHeader(isToBeRetried, attemptCount);
@@ -271,22 +271,25 @@ export default class DeployImpl {
                     failed = queue.slice(i).map((pkg) => packagesToPackageInfo[pkg.packageName]);
                 }
 
-                let postHookStatus = await this._postDeployHook?.postDeployPackage(
-                    sfpPackage,
-                    packageInstallationResult,
-                    this.props.targetUsername,
-                    sfpPackages,
-                    this.props.devhubUserName,
-                    this.props.logger
-                );
-
-                if (postHookStatus?.isToFailDeployment) {
-                    failed = queue.slice(i).map((pkg) => packagesToPackageInfo[pkg.packageName]);
-                    throw new Error(
-                        postHookStatus.message
-                            ? postHookStatus.message
-                            : 'Hook Failed to execute, but didnt provide proper message'
+                // Only deploy post hook when package installation is successful
+                if(packageInstallationResult.result === PackageInstallationStatus.Succeeded) {
+                    let postHookStatus = await this._postDeployHook?.postDeployPackage(
+                        sfpPackage,
+                        packageInstallationResult,
+                        this.props.targetUsername,
+                        sfpPackages,
+                        this.props.devhubUserName,
+                        this.props.logger
                     );
+
+                    if (postHookStatus?.isToFailDeployment) {
+                        failed = queue.slice(i).map((pkg) => packagesToPackageInfo[pkg.packageName]);
+                        throw new Error(
+                            postHookStatus.message
+                                ? postHookStatus.message
+                                : 'Hook Failed to execute, but didnt provide proper message'
+                        );
+                    }
                 }
 
                 if (packageInstallationResult.result === PackageInstallationStatus.Failed) {
@@ -303,7 +306,7 @@ export default class DeployImpl {
                 failed: failed,
                 queue: queue,
                 packagesToPackageInfo: packagesToPackageInfo,
-                error: null,
+                error: null 
             };
         } catch (err) {
             SFPLogger.log(err, LoggerLevel.ERROR, this.props.logger);
@@ -314,7 +317,7 @@ export default class DeployImpl {
                 failed: failed,
                 queue: queue,
                 packagesToPackageInfo: packagesToPackageInfo,
-                error: err,
+                error: err.message,
             };
         }
     }

diff --git a/packages/sfpowerscripts-cli/src/impl/validate/ValidateImpl.ts b/packages/sfpowerscripts-cli/src/impl/validate/ValidateImpl.ts
@@ -380,12 +380,18 @@ export default class ValidateImpl implements PostDeployHook, PreDeployHook {
 				);
 
 				FileOutputHandler.getInstance().appendOutput(`validation-error.md`,`### 💣 Deployment Failed  💣`);
+				let firstPackageFailedToValdiate = deploymentResult.failed[0];
+				FileOutputHandler.getInstance().appendOutput(`validation-error.md`,`Package validation failed for  **${firstPackageFailedToValdiate.sfpPackage.packageName}** due to`);  
+				FileOutputHandler.getInstance().appendOutput(`validation-error.md`,"");  
+				FileOutputHandler.getInstance().appendOutput(`validation-error.md`,deploymentResult.error);  
+
+				FileOutputHandler.getInstance().appendOutput(`validation-error.md`,`Package that are not validated:`);  
 				deploymentResult.failed.map(
-					(packageInfo) => {
-						FileOutputHandler.getInstance().appendOutput(`validation-error.md`,`Package validation failed for  **${packageInfo.sfpPackage.packageName}**`);    
+					(packageInfo, index) => {
+						if (index!=0)
+						 FileOutputHandler.getInstance().appendOutput(`validation-error.md`,`**${packageInfo.sfpPackage.packageName}**`);    
 					}
 				);
-
 			}
 
 			SFPLogger.printHeaderLine('',COLOR_HEADER,LoggerLevel.INFO);