mcdev 4.1.12 → 4.2.1

package/lib/Deployer.js

@@ -116,15 +116,15 @@ class Deployer {
             ) {
                 const buObject = await Cli.getCredentialObject(
                     properties,
-                    cred !== null ? cred + '/' + bu : null,
+                    cred === null ? null : cred + '/' + bu,
                     null,
                     true
                 );
-                if (buObject !== null) {
+                if (buObject === null) {
+                    return;
+                } else {
                     cred = buObject.credential;
                     bu = buObject.businessUnit;
-                } else {
-                    return;
                 }
             }
 
@@ -328,11 +328,11 @@ class Deployer {
         const allowedDeFolderContentTypes = ['dataextension', 'shared_dataextension'];
         for (const metadataType of metadataTypeArr) {
             if (!MetadataTypeInfo[metadataType].definition.dependencies.includes('folder')) {
-                Util.logger.debug(` ☇ skipping ${metadataType}: folder not a dependency`);
+                Util.logger.debug(` ☇ skipping ${metadataType} folders: folder not a dependency`);
                 continue;
             }
             if (!MetadataTypeInfo[metadataType].definition.folderType) {
-                Util.logger.debug(` ☇ skipping ${metadataType}: folderType not set`);
+                Util.logger.debug(` ☇ skipping ${metadataType} folders: folderType not set`);
                 continue;
             }
             if (
@@ -341,11 +341,13 @@ class Deployer {
                 )
             ) {
                 Util.logger.warn(
-                    ` ☇ skipping ${metadataType}: folderType ${MetadataTypeInfo[metadataType].definition.folderType} not supported for deployment`
+                    ` ☇ skipping ${metadataType} folders: folderType ${MetadataTypeInfo[metadataType].definition.folderType} not supported for deployment. Please consider creating folders for this type manually as a pre-deployment step, if you see errors about missing dependent folders for this type later in this log.`
                 );
                 continue;
             }
-            Util.logger.debug(`Creating relevant folders for ${metadataType} in deploy dir`);
+            Util.logger.debug(
+                ` - create ${metadataType} folders: Creating relevant folders in deploy dir`
+            );
 
             const allFolders = Object.keys(metadata[metadataType])
                 .filter(

package/lib/MetadataTypeDefinitions.js

@@ -32,6 +32,9 @@ const MetadataTypeDefinitions = {
     role: require('./metadataTypes/definitions/Role.definition'),
     script: require('./metadataTypes/definitions/Script.definition'),
     setDefinition: require('./metadataTypes/definitions/SetDefinition.definition'),
+    transactionalEmail: require('./metadataTypes/definitions/TransactionalEmail.definition'),
+    transactionalPush: require('./metadataTypes/definitions/TransactionalPush.definition'),
+    transactionalSMS: require('./metadataTypes/definitions/TransactionalSMS.definition'),
     triggeredSendDefinition: require('./metadataTypes/definitions/TriggeredSendDefinition.definition'),
 };
 

package/lib/MetadataTypeInfo.js

@@ -32,6 +32,9 @@ const MetadataTypeInfo = {
     role: require('./metadataTypes/Role'),
     script: require('./metadataTypes/Script'),
     setDefinition: require('./metadataTypes/SetDefinition'),
+    transactionalEmail: require('./metadataTypes/TransactionalEmail'),
+    transactionalPush: require('./metadataTypes/TransactionalPush'),
+    transactionalSMS: require('./metadataTypes/TransactionalSMS'),
     triggeredSendDefinition: require('./metadataTypes/TriggeredSendDefinition'),
 };
 

package/lib/Retriever.js

@@ -113,11 +113,11 @@ class Retriever {
                     }
                     Util.logger.info(
                         `Retrieving: ${metadataType}` +
-                            (typeKeyMap[metadataType][0] !== null
-                                ? ` ${color.dim}(Keys: ${typeKeyMap[metadataType].join(', ')})${
+                            (typeKeyMap[metadataType][0] === null
+                                ? ''
+                                : ` ${color.dim}(Keys: ${typeKeyMap[metadataType].join(', ')})${
                                       color.reset
-                                  }`
-                                : '')
+                                  }`)
                     );
                     result = await (changelogOnly
                         ? MetadataTypeInfo[type].retrieveChangelog(this.buObject, null, subType)
@@ -163,9 +163,16 @@ class Retriever {
                     }
                 }
             } catch (ex) {
-                Util.logger.errorStack(ex, `Retrieving ${metadataType} failed`);
-                // do not continue retrieving if one type failed. simply skip processing the rest of the for-loop
-                break;
+                if (
+                    ex.code === 'invalid_client' ||
+                    ex.message.startsWith('Client authentication failed.')
+                ) {
+                    // do not continue retrieving if we logged an authentication issue
+                    Util.logger.error(ex.message);
+                    break;
+                } else {
+                    Util.logger.errorStack(ex, ` - Retrieving ${metadataType} failed`);
+                }
             }
         }
         return retrieveChangelog;

package/lib/cli.js

@@ -392,6 +392,7 @@ yargs
  * @returns {string[]} values split into an array.
  */
 function csvToArray(csv) {
+    // eslint-disable-next-line unicorn/no-negated-condition
     return !csv
         ? null
         : csv.includes(',')

package/lib/index.js

@@ -151,15 +151,15 @@ class Mcdev {
             ) {
                 const buObject = await Cli.getCredentialObject(
                     properties,
-                    cred !== null ? cred + '/' + bu : null,
+                    cred === null ? null : cred + '/' + bu,
                     null,
                     true
                 );
-                if (buObject !== null) {
+                if (buObject === null) {
+                    return;
+                } else {
                     cred = buObject.credential;
                     bu = buObject.businessUnit;
-                } else {
-                    return;
                 }
             }
 
@@ -206,7 +206,7 @@ class Mcdev {
         }
         const buObject = await Cli.getCredentialObject(
             properties,
-            cred !== null ? cred + '/' + bu : null,
+            cred === null ? null : cred + '/' + bu,
             null,
             true
         );
@@ -290,7 +290,7 @@ class Mcdev {
      */
     static async initProject(credentialsName) {
         Util.logger.info('mcdev:: Setting up project');
-        const properties = await config.getProperties(!!credentialsName);
+        const properties = await config.getProperties(!!credentialsName, true);
         await Init.initProject(properties, credentialsName);
     }
 

package/lib/metadataTypes/AccountUser.js

@@ -112,7 +112,7 @@ class AccountUser extends MetadataType {
                 },
             };
         }
-
+        Util.logger.info(` - Loading ${this.definition.type}. This might take a while...`);
         return super.retrieveSOAP(retrieveDir, buObject, requestParams);
     }
     /**
@@ -377,7 +377,7 @@ class AccountUser extends MetadataType {
         metadata.AssociatedBusinessUnits__c = this.userIdBuMap[metadata.ID] || [];
 
         let roles;
-        if (metadata.Roles.Role) {
+        if (metadata.Roles?.Role) {
             // normalize to always use array
             if (!metadata.Roles.Role.length) {
                 metadata.Roles.Role = [metadata.Roles.Role];

package/lib/metadataTypes/Asset.js

@@ -169,7 +169,7 @@ class Asset extends MetadataType {
         const subtypeIds = subTypeArray?.map(
             (subTypeItemName) => Asset.definition.typeMapping[subTypeItemName]
         );
-        const uri = 'asset/v1/content/assets/query';
+        const uri = '/asset/v1/content/assets/query';
         const payload = {
             page: {
                 page: 1,
@@ -270,6 +270,15 @@ class Asset extends MetadataType {
 
         // only when we save results do we need the complete metadata or files. caching can skip these
         if (retrieveDir && items.length > 0) {
+            for (const item of items) {
+                if (item.customerKey.trim() !== item.customerKey) {
+                    Util.logger.warn(
+                        `  - ${this.definition.type} ${item[this.definition.nameField]} (${
+                            item[this.definition.keyField]
+                        }) has leading or trailing spaces in customerKey. Please remove them in SFMC.`
+                    );
+                }
+            }
             // we have to wait on execution or it potentially causes memory reference issues when changing between BUs
             await this.requestAndSaveExtended(items, subType, retrieveDir, templateVariables);
             Util.logger.debug(`Downloaded asset-${subType}: ${items.length}`);
@@ -486,7 +495,11 @@ class Asset extends MetadataType {
      * @returns {TYPE.CodeExtractItem} metadata
      */
     static postRetrieveTasks(metadata) {
-        return this.parseMetadata(metadata);
+        // folder
+        this.setFolderPath(metadata);
+        // extract HTML for selected subtypes and convert payload for easier processing in MetadataType.saveResults()
+        metadata = this._extractCode(metadata);
+        return metadata;
     }
 
     /**
@@ -778,19 +791,6 @@ class Asset extends MetadataType {
         }
     }
 
-    /**
-     * parses retrieved Metadata before saving
-     *
-     * @param {TYPE.AssetItem} metadata a single asset definition
-     * @returns {TYPE.CodeExtractItem} parsed metadata definition
-     */
-    static parseMetadata(metadata) {
-        // folder
-        this.setFolderPath(metadata);
-        // extract HTML for selected subtypes and convert payload for easier processing in MetadataType.saveResults()
-        metadata = this._extractCode(metadata);
-        return metadata;
-    }
     /**
      * helper for {@link preDeployTasks} that loads extracted code content back into JSON
      *
@@ -806,13 +806,15 @@ class Asset extends MetadataType {
         const fileList = [];
         let subDirArr;
         let readDirArr;
+        // unfortunately, asset's key can contain spaces at beginning/end which can break the file system when folders are created with it
+        const customerKey = metadata.customerKey.trim();
         switch (metadata.assetType.name) {
             case 'templatebasedemail': // message
             case 'htmlemail': {
                 // message
                 // this complex type always creates its own subdir per asset
                 subDirArr = [this.definition.type, subType];
-                readDirArr = [deployDir, ...subDirArr, templateName || metadata.customerKey];
+                readDirArr = [deployDir, ...subDirArr, templateName || customerKey];
 
                 // metadata.views.html.content (mandatory)
                 // the main content can be empty (=not set up yet) hence check if we did extract sth or else readFile() will print error msgs
@@ -833,7 +835,7 @@ class Asset extends MetadataType {
                     if (templateName) {
                         // to use this method in templating, store a copy of the info in fileList
                         fileList.push({
-                            subFolder: [...subDirArr, metadata.customerKey],
+                            subFolder: [...subDirArr, customerKey],
                             fileName: 'index' + subtypeExtension,
                             fileExt: 'html',
                             content: metadata.views.html.content,
@@ -850,7 +852,7 @@ class Asset extends MetadataType {
                         subtypeExtension,
                         subDirArr,
                         fileList,
-                        metadata.customerKey,
+                        customerKey,
                         templateName,
                         fileListOnly
                     );
@@ -866,9 +868,7 @@ class Asset extends MetadataType {
                     await File.pathExists(
                         File.normalizePath([
                             ...readDirArr,
-                            `${
-                                templateName || metadata.customerKey // TODO check why this could be templateName
-                            }${subtypeExtension}.html`,
+                            `${templateName || customerKey}${subtypeExtension}.html`,
                         ])
                     )
                 ) {
@@ -876,7 +876,7 @@ class Asset extends MetadataType {
                     if (!fileListOnly) {
                         metadata.views.text.content = await File.readFilteredFilename(
                             readDirArr,
-                            (templateName || metadata.customerKey) + subtypeExtension,
+                            (templateName || customerKey) + subtypeExtension,
                             'html'
                         );
                     }
@@ -884,7 +884,7 @@ class Asset extends MetadataType {
                         // to use this method in templating, store a copy of the info in fileList
                         fileList.push({
                             subFolder: subDirArr,
-                            fileName: metadata.customerKey + subtypeExtension,
+                            fileName: customerKey + subtypeExtension,
                             fileExt: 'html',
                             content: metadata.views.text.content,
                         });
@@ -896,7 +896,7 @@ class Asset extends MetadataType {
                 // asset
                 // this complex type always creates its own subdir per asset
                 subDirArr = [this.definition.type, subType];
-                readDirArr = [deployDir, ...subDirArr, templateName || metadata.customerKey];
+                readDirArr = [deployDir, ...subDirArr, templateName || customerKey];
 
                 // metadata.views.html.slots.<>.blocks.<>.content (optional) (pre & post 20222)
                 if (metadata?.views?.html?.slots) {
@@ -907,7 +907,7 @@ class Asset extends MetadataType {
                         subtypeExtension,
                         subDirArr,
                         fileList,
-                        metadata.customerKey,
+                        customerKey,
                         templateName,
                         fileListOnly
                     );
@@ -934,7 +934,7 @@ class Asset extends MetadataType {
                     if (templateName) {
                         // to use this method in templating, store a copy of the info in fileList
                         fileList.push({
-                            subFolder: [...subDirArr, metadata.customerKey],
+                            subFolder: [...subDirArr, customerKey],
                             fileName: 'views.html.content' + subtypeExtension,
                             fileExt: 'html',
                             content: metadata.views.html.content,
@@ -960,7 +960,7 @@ class Asset extends MetadataType {
                     if (templateName) {
                         // to use this method in templating, store a copy of the info in fileList
                         fileList.push({
-                            subFolder: [...subDirArr, metadata.customerKey],
+                            subFolder: [...subDirArr, customerKey],
                             fileName: 'content' + subtypeExtension,
                             fileExt: 'html',
                             content: metadata.views.html.content,
@@ -993,7 +993,7 @@ class Asset extends MetadataType {
                         await File.pathExists(
                             File.normalizePath([
                                 ...readDirArr,
-                                `${templateName || metadata.customerKey}${subtypeExtension}.${ext}`,
+                                `${templateName || customerKey}${subtypeExtension}.${ext}`,
                             ])
                         )
                     ) {
@@ -1001,7 +1001,7 @@ class Asset extends MetadataType {
                         if (!fileListOnly) {
                             metadata.content = await File.readFilteredFilename(
                                 readDirArr,
-                                (templateName || metadata.customerKey) + subtypeExtension,
+                                (templateName || customerKey) + subtypeExtension,
                                 ext
                             );
                         }
@@ -1009,7 +1009,7 @@ class Asset extends MetadataType {
                             // to use this method in templating, store a copy of the info in fileList
                             fileList.push({
                                 subFolder: subDirArr,
-                                fileName: (templateName || metadata.customerKey) + subtypeExtension,
+                                fileName: (templateName || customerKey) + subtypeExtension,
                                 fileExt: ext,
                                 content: metadata.content,
                             });
@@ -1104,7 +1104,7 @@ class Asset extends MetadataType {
         }
     }
     /**
-     * helper for {@link parseMetadata} that finds code content in JSON and extracts it
+     * helper for {@link postRetrieveTasks} that finds code content in JSON and extracts it
      * to allow saving that separately and formatted
      *
      * @param {TYPE.AssetItem} metadata a single asset definition
@@ -1113,6 +1113,8 @@ class Asset extends MetadataType {
     static _extractCode(metadata) {
         const codeArr = [];
         let subType;
+        // unfortunately, asset's key can contain spaces at beginning/end which can break the file system when folders are created with it
+        const customerKey = metadata.customerKey.trim();
         switch (metadata.assetType.name) {
             case 'templatebasedemail': // message
             case 'htmlemail': {
@@ -1133,7 +1135,11 @@ class Asset extends MetadataType {
                     this._extractCode_slots('views.html.slots', metadata.views.html.slots, codeArr);
                 }
 
-                return { json: metadata, codeArr: codeArr, subFolder: [metadata.customerKey] };
+                return {
+                    json: metadata,
+                    codeArr: codeArr,
+                    subFolder: [customerKey],
+                };
             }
             case 'textonlyemail': {
                 // message
@@ -1141,7 +1147,7 @@ class Asset extends MetadataType {
                 if (metadata.views?.text?.content?.length) {
                     codeArr.push({
                         subFolder: null,
-                        fileName: metadata.customerKey,
+                        fileName: customerKey,
                         fileExt: 'html',
                         content: metadata.views.text.content,
                     });
@@ -1179,7 +1185,11 @@ class Asset extends MetadataType {
                     });
                     delete metadata.content;
                 }
-                return { json: metadata, codeArr: codeArr, subFolder: [metadata.customerKey] };
+                return {
+                    json: metadata,
+                    codeArr: codeArr,
+                    subFolder: [customerKey],
+                };
             }
             case 'buttonblock': // block - Button Block
             case 'freeformblock': // block
@@ -1202,7 +1212,7 @@ class Asset extends MetadataType {
                 if (metadata?.content?.length) {
                     codeArr.push({
                         subFolder: null,
-                        fileName: metadata.customerKey,
+                        fileName: customerKey,
                         fileExt: fileExt,
                         content: metadata.content,
                     });

package/lib/metadataTypes/Automation.js

@@ -937,10 +937,7 @@ class Automation extends MetadataType {
      * @returns {string[]} list of all files that need to be committed in a flat array ['path/file1.ext', 'path/file2.ext']
      */
     static getFilesToCommit(keyArr) {
-        if (!this.properties.metaDataTypes.documentOnRetrieve.includes(this.definition.type)) {
-            // document automation is not active upon retrieve, run default method instead
-            return super.getFilesToCommit(keyArr);
-        } else {
+        if (this.properties.metaDataTypes.documentOnRetrieve.includes(this.definition.type)) {
             // document automation is active. assume we want to commit the MD file as well
             const path = File.normalizePath([
                 this.properties.directories.retrieve,
@@ -954,6 +951,9 @@ class Automation extends MetadataType {
                 File.normalizePath([path, `${key}.${this.definition.type}-doc.md`]),
             ]);
             return fileList;
+        } else {
+            // document automation is not active upon retrieve, run default method instead
+            return super.getFilesToCommit(keyArr);
         }
     }
 }

package/lib/metadataTypes/DataExtension.js

@@ -360,7 +360,13 @@ class DataExtension extends MetadataType {
             Util.logger.info(' - Caching dependent Metadata: folder (shared via _ParentBU_)');
             Folder.client = this.client;
             Folder.properties = this.properties;
-            const result = await Folder.retrieveForCache(buObjectParentBu);
+            const result = await Folder.retrieveForCache(buObjectParentBu, [
+                'shared_data',
+                'synchronizeddataextension',
+                'salesforcedataextension',
+                'shared_dataextension',
+                'dataextension',
+            ]);
             cache.mergeMetadata('folder', result.metadata, buObject.eid);
 
             // get the types and clean out non-shared ones
@@ -1025,10 +1031,10 @@ class DataExtension extends MetadataType {
         const { metadata } = await super.retrieveSOAP(null, null, options, additionalFields);
         for (const key in metadata) {
             // some system data extensions do not have CategoryID which throws errors in other places. These do not need to be parsed
-            if (!metadata[key].CategoryID) {
-                delete metadata[key];
-            } else {
+            if (metadata[key].CategoryID) {
                 metadata[key].Fields = [];
+            } else {
+                delete metadata[key];
             }
         }
         return metadata;
@@ -1041,10 +1047,7 @@ class DataExtension extends MetadataType {
      * @returns {string[]} list of all files that need to be committed in a flat array ['path/file1.ext', 'path/file2.ext']
      */
     static getFilesToCommit(keyArr) {
-        if (!this.properties.metaDataTypes.documentOnRetrieve.includes(this.definition.type)) {
-            // document dataExtension is not active upon retrieve, run default method instead
-            return super.getFilesToCommit(keyArr);
-        } else {
+        if (this.properties.metaDataTypes.documentOnRetrieve.includes(this.definition.type)) {
             // document dataExtension is active. assume we want to commit the MD file as well
             const path = File.normalizePath([
                 this.properties.directories.retrieve,
@@ -1058,6 +1061,9 @@ class DataExtension extends MetadataType {
                 File.normalizePath([path, `${key}.${this.definition.type}-doc.md`]),
             ]);
             return fileList;
+        } else {
+            // document dataExtension is not active upon retrieve, run default method instead
+            return super.getFilesToCommit(keyArr);
         }
     }
 }

package/lib/metadataTypes/DataExtensionField.js

@@ -100,6 +100,19 @@ class DataExtensionField extends MetadataType {
      * @returns {Object.<string, TYPE.DataExtensionFieldItem>} existing fields by their original name to allow re-adding FieldType after update
      */
     static async prepareDeployColumnsOnUpdate(deployColumns, deKey) {
+        // get row count to know which field restrictions apply
+        let hasData = false;
+        try {
+            const rowset = await this.client.rest.get(
+                `/data/v1/customobjectdata/key/${deKey}/rowset?$page=1&$pagesize=1`
+            );
+            const rowCount = rowset.count;
+            hasData = rowCount > 0;
+            Util.logger.debug(`dataExtension ${deKey} row count: ${rowCount}`);
+        } catch (ex) {
+            Util.logger.debug(`Could not retrieve rowcount for ${deKey}: ${ex.message}`);
+        }
+
         // retrieve existing fields to enable updating them
         const response = await this.retrieveForCache(
             {
@@ -129,6 +142,7 @@ class DataExtensionField extends MetadataType {
 
                 // Updating to a new FieldType will result in an error; warn & afterwards remove it
                 if (itemOld.FieldType !== item.FieldType) {
+                    // applicable: with or without data but simply ignored by API
                     Util.logger.warn(
                         ` - The Field Type of an existing field cannot be changed. Keeping the original value for [${deKey}].[${item.Name}]: '${itemOld.FieldType}'`
                     );
@@ -141,14 +155,16 @@ class DataExtensionField extends MetadataType {
                 delete item.FieldType;
 
                 if (itemOld.MaxLength > item.MaxLength) {
+                    // applicable: with or without data (Code 310007)
                     Util.logger.warn(
                         ` - The length of an existing field cannot be decreased. Keeping the original value for [${deKey}].[${item.Name}]: '${itemOld.MaxLength}'`
                     );
                     item.MaxLength = itemOld.MaxLength;
                 }
                 if (Util.isFalse(itemOld.IsRequired) && Util.isTrue(item.IsRequired)) {
+                    // applicable: with or without data (Code 310007)
                     Util.logger.warn(
-                        ` - A field cannot be changed to be required on update after it was created to allow nulls: [${deKey}].[${item.Name}]`
+                        ` - A field cannot be changed to be required on update after it was created to allow nulls. Resetting to not equired: [${deKey}].[${item.Name}]`
                     );
                     item.IsRequired = itemOld.IsRequired;
                 }
@@ -179,11 +195,20 @@ class DataExtensionField extends MetadataType {
                 item.ObjectID = itemOld.ObjectID;
             } else {
                 // field is getting added ---
-                if (Util.isTrue(item.IsRequired) && item.DefaultValue === '') {
-                    Util.logger.warn(
-                        ` - Adding new fields to an existing table requires that these fields are either not-required (nullable) or have a default value set. Changing [${deKey}].[${item.Name}] to be not-required`
-                    );
-                    item.IsRequired = false;
+
+                if (hasData && Util.isTrue(item.IsRequired) && item.DefaultValue === '') {
+                    // applicable: with data only
+                    if (Util.isFalse(item.IsPrimaryKey)) {
+                        Util.logger.warn(
+                            ` - Adding new fields to an existing table requires that these fields are either not-required (nullable) or have a default value set. Changing [${deKey}].[${item.Name}] to be not-required`
+                        );
+                        item.IsRequired = false;
+                    } else {
+                        Util.logger.error(
+                            `- You cannot add a new primary key field to an existing table that has data. Removing [${deKey}].[${item.Name}] from deployment`
+                        );
+                        deployColumns.splice(i, 1);
+                    }
                 }
                 if (item.Name_new) {
                     Util.logger.warn(
@@ -194,6 +219,15 @@ class DataExtensionField extends MetadataType {
                 // Field doesn't exist in target, therefore Remove ObjectID if present
                 delete item.ObjectID;
             }
+            if (Util.isTrue(item.IsPrimaryKey) && Util.isFalse(item.IsRequired)) {
+                // applicable: with or without data
+                Util.logger.warn(
+                    `- Primary Key field [${deKey}].[${item.Name}] cannot be not-required (nullable). Changing field to be required!`
+                );
+                item.IsRequired = true;
+            }
+
+            // filter bad manual changes to the json
             if (!Util.isTrue(item.IsRequired) && !Util.isFalse(item.IsRequired)) {
                 Util.logger.error(
                     `- Invalid value for 'IsRequired' of [${deKey}].[${item.Name}]. Found '${item.IsRequired}' instead of 'true'/'false'. Removing field from deploy!`
@@ -207,6 +241,7 @@ class DataExtensionField extends MetadataType {
                 deployColumns.splice(i, 1);
             }
         }
+
         Util.logger.debug(
             `${deployColumns.length} Fields added/updated for [${deKey}]${
                 deployColumns.length ? ': ' : ''
@@ -277,15 +312,15 @@ class DataExtensionField extends MetadataType {
             this.postDeleteTasks(buObject, customerKey);
             return true;
         } catch (ex) {
-            if (!handleOutside) {
+            if (handleOutside) {
+                throw ex;
+            } else {
                 const errorMsg = ex.results?.length
                     ? `${ex.results[0].StatusMessage} (Code ${ex.results[0].ErrorCode})`
                     : ex.message;
                 Util.logger.error(
                     `- error deleting ${this.definition.type} '${customerKey}': ${errorMsg}`
                 );
-            } else {
-                throw ex;
             }
 
             return false;

package/lib/metadataTypes/Discovery.js

@@ -25,11 +25,7 @@ class Discovery extends MetadataType {
         if (key) {
             Util.logger.error('Discovery.retrieve() does not support key parameter');
         }
-        if (buObject.eid !== buObject.mid) {
-            // don't run for BUs other than Parent BU
-            Util.logger.warn(' - Skipping Discovery retrieval on non-parent BU');
-            return;
-        } else {
+        if (buObject.eid === buObject.mid) {
             const res = await this.client.rest.getCollection(
                 Object.keys(this.definition.endPointMapping).map(
                     (endpoint) => this.definition.endPointMapping[endpoint]
@@ -44,6 +40,10 @@ class Discovery extends MetadataType {
             await super.saveResults(metadataStructure, retrieveDir, null);
             Util.logger.info('Downloaded: ' + this.definition.type);
             return { metadata: metadataStructure, type: this.definition.type };
+        } else {
+            // don't run for BUs other than Parent BU
+            Util.logger.warn(' - Skipping Discovery retrieval on non-parent BU');
+            return;
         }
     }
 }