mcdev 8.3.1 → 8.4.0

package/lib/metadataTypes/definitions/FileLocation.definition.js

@@ -5,13 +5,14 @@ export default {
     hasExtended: false,
     idField: 'id',
     keyIsFixed: true,
-    keyField: 'name',
+    keyField: 'customerKey',
     nameField: 'name',
     createdDateField: null,
     createdNameField: null,
     lastmodDateField: null,
     lastmodNameField: null,
     restPagination: false,
+    maxKeyLength: 36, // confirmed max length
     type: 'fileLocation',
     typeDescription:
         'Used for export or import of files to/from Marketing Cloud. Previously this was labeled ftpLocation.',
@@ -32,37 +33,81 @@ export default {
         'Azure Blob Storage': 15,
         'Google Cloud Storage': 16,
     },
+    locationTypeMappingDeployable: {
+        'External SFTP Site': 'ExternalSftp',
+        'Amazon Simple Storage Service': 'AmazonSimpleStorage',
+        'Azure Blob Storage': 'AzureBlobStorage',
+        'Google Cloud Storage': 'GcpBlobStorage',
+    },
+    locationTypeIdMappingDeployable: {
+        2: 'ExternalSftp',
+        13: 'AmazonSimpleStorage',
+        15: 'AzureBlobStorage',
+        16: 'GcpBlobStorage',
+    },
     fields: {
         id: {
             isCreateable: false,
             isUpdateable: false,
-            retrieving: true,
+            retrieving: false,
             template: false,
         },
         locationTypeId: {
+            // automation endpoint
             isCreateable: false,
             isUpdateable: false,
-            retrieving: true,
+            retrieving: false,
+            template: false,
+        },
+        locationType: {
+            // data endpoint
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: false,
             template: false,
         },
         locationUrl: {
             isCreateable: false,
             isUpdateable: false,
+            retrieving: false,
+            template: false,
+        },
+        name: {
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: true,
         },
-        name: {
-            isCreateable: false,
-            isUpdateable: false,
+        customerKey: {
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: true,
         },
-        relPath: {
+        description: {
             isCreateable: true,
             isUpdateable: true,
             retrieving: true,
             template: true,
         },
+        relPath: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: false,
+            template: false,
+        },
+        awsFileTransferLocation: {
+            skipValidation: true,
+        },
+        azureFileTransferLocation: {
+            skipValidation: true,
+        },
+        gcpFileTransferLocation: {
+            skipValidation: true,
+        },
+        sFtpFileTransferLocation: {
+            skipValidation: true,
+        },
         c__locationType: {
             isCreateable: false,
             isUpdateable: false,

package/lib/metadataTypes/definitions/Journey.definition.js

@@ -1188,6 +1188,12 @@ export default {
             retrieving: true,
             template: true,
         },
+        campaigns: {
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
+        },
         metaData: {
             skipValidation: true,
         },

package/lib/metadataTypes/definitions/Script.definition.js

@@ -100,6 +100,12 @@ export default {
             retrieving: false,
             template: false,
         },
+        parentCategoryId: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: false,
+            template: false,
+        },
         r__folder_Path: { skipValidation: true },
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "8.3.1",
+    "version": "8.4.0",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",
@@ -78,40 +78,40 @@
         "json-to-table": "4.2.1",
         "mustache": "4.2.0",
         "p-limit": "6.2.0",
-        "prettier": "3.5.3",
+        "prettier": "3.8.1",
         "prettier-plugin-sql": "0.19.2",
-        "semver": "7.7.3",
-        "sfmc-sdk": "2.1.2",
+        "semver": "7.7.4",
+        "sfmc-sdk": "2.1.4",
         "simple-git": "3.30.0",
         "toposort": "2.0.2",
         "update-notifier": "7.3.1",
         "winston": "3.19.0",
         "yargs": "17.7.2",
-        "yocto-spinner": "1.0.0"
+        "yocto-spinner": "1.1.0"
     },
     "devDependencies": {
-        "@eslint/js": "9.28.0",
+        "@eslint/js": "9.39.2",
         "@types/fs-extra": "11.0.4",
         "@types/inquirer": "9.0.7",
         "@types/mocha": "10.0.8",
-        "@types/node": "24.9.1",
+        "@types/node": "25.2.3",
         "@types/yargs": "17.0.33",
         "assert": "2.1.0",
         "axios-mock-adapter": "2.0.0",
         "c8": "10.1.3",
         "chai": "6.2.2",
         "chai-files": "1.4.0",
-        "eslint": "9.28.0",
+        "eslint": "9.39.2",
         "eslint-config-ssjs": "2.0.0",
         "eslint-plugin-jsdoc": "50.7.1",
         "eslint-plugin-mocha": "11.2.0",
         "eslint-plugin-prettier": "5.5.5",
         "eslint-plugin-unicorn": "59.0.1",
-        "fast-xml-parser": "5.3.4",
+        "fast-xml-parser": "5.3.5",
         "globals": "17.3.0",
         "husky": "9.1.7",
-        "lint-staged": "16.2.6",
-        "mocha": "11.7.4",
+        "lint-staged": "16.2.7",
+        "mocha": "11.7.5",
         "mock-fs": "5.3.0",
         "npm-run-all": "4.1.5",
         "prettier-eslint": "16.4.2",

package/test/general.test.js

@@ -775,7 +775,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 36;
+                const expectedApiCallsRetrieve = 37;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -880,7 +880,7 @@ describe('GENERAL', () => {
             });
 
             it('buildTemplate + buildDefinition for multiple types with keys and --retrieve', async () => {
-                const expectedApiCallsRetrieve = 33;
+                const expectedApiCallsRetrieve = 34;
 
                 // preparation
                 const argvMetadata = [
@@ -985,7 +985,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 108;
+                const expectedApiCallsRetrieve = 109;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1227,7 +1227,7 @@ describe('GENERAL', () => {
                     await testUtils.getActualDeployFile('testTemplated_query', 'query', 'sql')
                 ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'build', 'sql'));
 
-                const expectedApiCallsRetrieve = 112;
+                const expectedApiCallsRetrieve = 113;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1239,7 +1239,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 36;
+                const expectedApiCallsRetrieve = 37;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1431,7 +1431,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 36;
+                const expectedApiCallsRetrieve = 37;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1502,7 +1502,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 36;
+                const expectedApiCallsRetrieve = 37;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1601,7 +1601,7 @@ describe('GENERAL', () => {
                 // download everything before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 108;
+                const expectedApiCallsRetrieve = 109;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1812,7 +1812,7 @@ describe('GENERAL', () => {
                     await testUtils.getActualDeployFile('testTemplated_query', 'query', 'sql')
                 ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'build', 'sql'));
 
-                const expectedApiCallsRetrieve = 112;
+                const expectedApiCallsRetrieve = 113;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1824,7 +1824,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 36;
+                const expectedApiCallsRetrieve = 37;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -2003,7 +2003,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 108;
+                const expectedApiCallsRetrieve = 109;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,

package/test/mockRoot/.mcdevrc.json

@@ -178,5 +178,5 @@
             "verification"
         ]
     },
-    "version": "8.3.1"
+    "version": "8.4.0"
 }

package/test/mockRoot/deploy/testInstance/testBU/fileLocation/ExactTarget Enhanced FTP.fileLocation-meta.json

@@ -0,0 +1,5 @@
+{
+    "name": "ExactTarget Enhanced FTP",
+    "customerKey": "ExactTarget Enhanced FTP",
+    "c__locationType": "Enhanced FTP Site Import Directory"
+}

package/test/mockRoot/deploy/testInstance/testBU/fileLocation/testExisting_fileLocation_aws.fileLocation-meta.json

@@ -0,0 +1,14 @@
+{
+    "name": "testExisting_fileLocation_aws_name",
+    "customerKey": "testExisting_fileLocation_aws",
+    "description": "updated via deploy",
+    "awsFileTransferLocation": {
+        "regionName": "eucentral1",
+        "transferAccelerationEnabled": false,
+        "accessKeyId": "key-id",
+        "relativePath": "my/path",
+        "bucketName": "bucket-name",
+        "authType": "AccessKey"
+    },
+    "c__locationType": "Amazon Simple Storage Service"
+}

package/test/mockRoot/deploy/testInstance/testBU/fileLocation/testExisting_fileLocation_exsftp.fileLocation-meta.json

@@ -0,0 +1,12 @@
+{
+    "name": "testExisting_fileLocation_exsftp_name",
+    "customerKey": "testExisting_fileLocation_exsftp",
+    "description": "updated via deploy",
+    "sFtpFileTransferLocation": {
+        "portNumber": 22,
+        "userName": "abc",
+        "url": "sftp://test.com",
+        "authType": "Password"
+    },
+    "c__locationType": "External SFTP Site"
+}

package/test/resourceFactory.js

@@ -276,6 +276,8 @@ export const handleRESTRequest = async (config) => {
             filterName = 'mostRecentVersionOnly';
         } else if (urlObj.searchParams.get('versionNumber')) {
             filterName = 'versionNumber';
+        } else if (urlObj.searchParams.get('status')) {
+            filterName = 'status';
         } else if (urlObj.searchParams.get('id')) {
             filterName = 'id';
         }
@@ -301,6 +303,9 @@ export const handleRESTRequest = async (config) => {
                   : '') +
               (urlObj.searchParams.get('mostRecentVersionOnly')
                   ? 'mostRecentVersionOnly=' + urlObj.searchParams.get('mostRecentVersionOnly')
+                  : '') +
+              (urlObj.searchParams.get('status')
+                  ? 'status=' + urlObj.searchParams.get('status')
                   : '')
             : null;
 
@@ -338,7 +343,8 @@ export const handleRESTRequest = async (config) => {
                     response.items &&
                     filterName !== 'mostRecentVersionOnly' &&
                     filterName !== 'versionNumber' &&
-                    filterName !== 'id'
+                    filterName !== 'id' &&
+                    filterName !== 'status'
                 ) {
                     response.items = response.items.filter((def) => def.name == filterName);
                 }
@@ -407,7 +413,8 @@ export const handleRESTRequest = async (config) => {
                 filterName &&
                 filterName !== 'mostRecentVersionOnly' &&
                 filterName !== 'versionNumber' &&
-                filterName !== 'id'
+                filterName !== 'id' &&
+                filterName !== 'status'
             ) {
                 const response = JSON.parse(
                     await fs.readFile(testPath + '.json', {

package/test/resources/9999999/automation/v1/ftplocations/get-response.json

@@ -1,7 +1,7 @@
 {
     "page": 1,
     "pageSize": 2,
-    "count": 2,
+    "count": 5,
     "items": [
         {
             "name": "Salesforce Objects & Reports",
@@ -13,6 +13,31 @@
             "id": "41a5ded7-0d98-4910-a15f-d09e7ab0af24",
             "locationTypeId": 0,
             "relPath": "ExactTarget Enhanced FTP"
+        },
+        {
+            "name": "testExisting_fileLocation_gcp_name",
+            "id": "5fc2cc79-b4fb-465d-bc09-7dacf8afebae",
+            "locationTypeId": 16,
+            "locationUrl": "GCP://some-bucket/Task/Activity"
+        },
+
+        {
+            "name": "testExisting_fileLocation_azure_name",
+            "id": "fff73b41-dced-4a2a-a6cf-430a46a18df6",
+            "locationTypeId": 15,
+            "locationUrl": "Azure://container-name/my/path"
+        },
+        {
+            "name": "testExisting_fileLocation_aws_name",
+            "id": "62bb39b1-c84f-47b5-98a0-61e5d79b7f31",
+            "locationTypeId": 13,
+            "locationUrl": "S3://bucket-name/my/path"
+        },
+        {
+            "name": "testExisting_fileLocation_exsftp_name",
+            "id": "335802a4-479d-4834-a491-fc5d2d068132",
+            "locationTypeId": 2,
+            "locationUrl": "sftp://test.com"
         }
     ]
 }

package/test/resources/9999999/automation/v1/scripts/39f6a488-20eb-4ba0-b0b9-023725b574e4/get-response.json

@@ -0,0 +1,10 @@
+{
+    "ssjsActivityId": "39f6a488-20eb-4ba0-b0b9-023725b574e4",
+    "name": "testExisting_script",
+    "key": "testExisting_script",
+    "description": "updated on deploy",
+    "script": "<script runat=\"server\">\n// dummy updated\n</script>",
+    "categoryId": 304,
+    "createdDate": "2022-10-20T00:41:26.163",
+    "modifiedDate": "2022-10-20T00:41:26.163"
+}

package/test/resources/9999999/automation/v1/scripts/39f6a488-20eb-4ba0-b0b9-023725b574e4/patch-response.json

@@ -5,6 +5,6 @@
     "description": "updated on deploy",
     "script": "<script runat=\"server\">\n// dummy updated\n</script>",
     "categoryId": 304,
-    "createdDate": "2022-10-20T00:41:26.163",
-    "modifiedDate": "2022-10-20T00:41:26.163"
+    "createdDate": "0001-01-01T00:00:00",
+    "modifiedDate": "0001-01-01T00:00:00"
 }

package/test/resources/9999999/data/v1/filetransferlocation/Salesforce%20Objects%20%26%20Reports/get-response.json

@@ -0,0 +1,4 @@
+{
+    "requestId": "bfc409fb-2fd5-459a-81d6-525b20f6eed4",
+    "resultMessages": []
+}

package/test/resources/9999999/data/v1/filetransferlocation/testExisting_fileLocation_aws/patch-response.json

@@ -0,0 +1,18 @@
+{
+    "fileTransferLocation": {
+        "customerKey": "testExisting_fileLocation_aws",
+        "name": "testExisting_fileLocation_aws_name",
+        "description": "updated via deploy",
+        "locationType": "AmazonSimpleStorage",
+        "awsFileTransferLocation": {
+            "regionName": "eucentral1",
+            "transferAccelerationEnabled": false,
+            "accessKeyId": "key-id",
+            "relativePath": "my/path",
+            "bucketName": "bucket-name",
+            "authType": "AccessKey"
+        }
+    },
+    "requestId": "ae8149ee-819e-40b7-b08f-cb59fdf88ddb",
+    "resultMessages": []
+}

package/test/resources/9999999/data/v1/filetransferlocation/testExisting_fileLocation_azure/delete-response.json

@@ -0,0 +1,4 @@
+{
+    "requestId": "dba273e4-6036-4c1d-99de-e08626e102d5",
+    "resultMessages": []
+}

package/test/resources/9999999/data/v1/filetransferlocation/testExisting_fileLocation_azure/get-response.json

@@ -0,0 +1,18 @@
+{
+    "fileTransferLocation": {
+        "customerKey": "testExisting_fileLocation_azure",
+        "name": "testExisting_fileLocation_azure_name",
+        "description": "blabla",
+        "locationType": "AzureBlobStorage",
+        "azureFileTransferLocation": {
+            "storageAccountName": "accountname",
+            "tenantId": "my-id",
+            "accessKeyId": "client-id",
+            "relativePath": "my/path",
+            "bucketName": "container-name",
+            "authType": "AccessKey"
+        }
+    },
+    "requestId": "d49c372e-9939-4b81-91d2-69a37a8bb036",
+    "resultMessages": []
+}

package/test/resources/9999999/data/v1/filetransferlocation/testExisting_fileLocation_exsftp/patch-response.json

@@ -0,0 +1,16 @@
+{
+    "fileTransferLocation": {
+        "customerKey": "testExisting_fileLocation_exsftp",
+        "name": "testExisting_fileLocation_exsftp_name",
+        "description": "updated via deploy",
+        "locationType": "ExternalSftp",
+        "sFtpFileTransferLocation": {
+            "portNumber": 22,
+            "userName": "abc",
+            "url": "sftp://test.com",
+            "authType": "Password"
+        }
+    },
+    "requestId": "05ef7257-72e6-4774-87c7-1f99aa892534",
+    "resultMessages": []
+}

package/test/resources/9999999/data/v1/filetransferlocations/get-response.json

@@ -0,0 +1,59 @@
+{
+    "page": 1,
+    "pageSize": 50,
+    "count": 4,
+    "items": [
+        {
+            "customerKey": "testExisting_fileLocation_gcp",
+            "name": "testExisting_fileLocation_gcp_name",
+            "description": "",
+            "locationType": "GcpBlobStorage",
+            "gcpFileTransferLocation": {
+                "relativePath": "Task/Activity",
+                "bucketName": "some-bucket"
+            }
+        },
+        {
+            "customerKey": "testExisting_fileLocation_aws",
+            "name": "testExisting_fileLocation_aws_name",
+            "description": "",
+            "locationType": "AmazonSimpleStorage",
+            "awsFileTransferLocation": {
+                "regionName": "eucentral1",
+                "transferAccelerationEnabled": false,
+                "accessKeyId": "key-id",
+                "relativePath": "my/path",
+                "bucketName": "bucket-name",
+                "authType": "AccessKey"
+            }
+        },
+        {
+            "customerKey": "testExisting_fileLocation_azure",
+            "name": "testExisting_fileLocation_azure_name",
+            "description": "blabla",
+            "locationType": "AzureBlobStorage",
+            "azureFileTransferLocation": {
+                "storageAccountName": "accountname",
+                "tenantId": "my-id",
+                "accessKeyId": "client-id",
+                "relativePath": "my/path",
+                "bucketName": "container-name",
+                "authType": "AccessKey"
+            }
+        },
+        {
+            "customerKey": "testExisting_fileLocation_exsftp",
+            "name": "testExisting_fileLocation_exsftp_name",
+            "description": "blabla",
+            "locationType": "ExternalSftp",
+            "sFtpFileTransferLocation": {
+                "portNumber": 22,
+                "userName": "abc",
+                "url": "sftp://test.com",
+                "authType": "Password"
+            }
+        }
+    ],
+    "requestId": "3870c0e1-943c-4ae4-9cff-26736372dbe7",
+    "resultMessages": []
+}

package/test/resources/9999999/fileLocation/build-expected.json

@@ -0,0 +1,14 @@
+{
+    "customerKey": "testTemplated_fileLocation_azure",
+    "description": "blabla",
+    "name": "testTemplated_fileLocation_azure_name",
+    "azureFileTransferLocation": {
+        "accessKeyId": "client-id",
+        "authType": "AccessKey",
+        "bucketName": "container-name",
+        "relativePath": "my/path",
+        "storageAccountName": "accountname",
+        "tenantId": "my-id"
+    },
+    "c__locationType": "Azure Blob Storage"
+}

package/test/resources/9999999/fileLocation/get-aws-expected.json

@@ -0,0 +1,14 @@
+{
+    "customerKey": "testExisting_fileLocation_aws",
+    "name": "testExisting_fileLocation_aws_name",
+    "description": "",
+    "awsFileTransferLocation": {
+        "accessKeyId": "key-id",
+        "authType": "AccessKey",
+        "bucketName": "bucket-name",
+        "regionName": "eucentral1",
+        "relativePath": "my/path",
+        "transferAccelerationEnabled": false
+    },
+    "c__locationType": "Amazon Simple Storage Service"
+}

package/test/resources/9999999/fileLocation/get-azure-expected.json

@@ -0,0 +1,14 @@
+{
+    "customerKey": "testExisting_fileLocation_azure",
+    "name": "testExisting_fileLocation_azure_name",
+    "description": "blabla",
+    "azureFileTransferLocation": {
+        "accessKeyId": "client-id",
+        "authType": "AccessKey",
+        "bucketName": "container-name",
+        "relativePath": "my/path",
+        "storageAccountName": "accountname",
+        "tenantId": "my-id"
+    },
+    "c__locationType": "Azure Blob Storage"
+}

package/test/resources/9999999/fileLocation/get-eftp-expected.json

@@ -0,0 +1,5 @@
+{
+    "customerKey": "ExactTarget Enhanced FTP",
+    "name": "ExactTarget Enhanced FTP",
+    "c__locationType": "Enhanced FTP Site Import Directory"
+}

package/test/resources/9999999/fileLocation/get-exsftp-expected.json

@@ -0,0 +1,12 @@
+{
+    "customerKey": "testExisting_fileLocation_exsftp",
+    "name": "testExisting_fileLocation_exsftp_name",
+    "description": "blabla",
+    "sFtpFileTransferLocation": {
+        "authType": "Password",
+        "portNumber": 22,
+        "url": "sftp://test.com",
+        "userName": "abc"
+    },
+    "c__locationType": "External SFTP Site"
+}

package/test/resources/9999999/fileLocation/get-gcp-expected.json

@@ -0,0 +1,10 @@
+{
+    "customerKey": "testExisting_fileLocation_gcp",
+    "name": "testExisting_fileLocation_gcp_name",
+    "description": "",
+    "gcpFileTransferLocation": {
+        "bucketName": "some-bucket",
+        "relativePath": "Task/Activity"
+    },
+    "c__locationType": "Google Cloud Storage"
+}

package/test/resources/9999999/fileLocation/get-sor-expected.json

@@ -0,0 +1,5 @@
+{
+    "customerKey": "Salesforce Objects & Reports",
+    "name": "Salesforce Objects & Reports",
+    "c__locationType": "Salesforce Objects and Reports"
+}