mcdev 8.3.0 → 8.4.0

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"
+}

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

@@ -0,0 +1,14 @@
+{
+    "customerKey": "testExisting_fileLocation_aws",
+    "description": "updated via deploy",
+    "name": "testExisting_fileLocation_aws_name",
+    "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/patch-exsftp-expected.json

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

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

@@ -0,0 +1,14 @@
+{
+    "customerKey": "{{{prefix}}}fileLocation_azure",
+    "description": "blabla",
+    "name": "{{{prefix}}}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/interaction/v1/interactions/get-response-status=Published.json

@@ -0,0 +1,40 @@
+{
+    "count": 1,
+    "page": 1,
+    "pageSize": 500,
+    "links": {},
+    "items": [
+        {
+            "id": "dsfdsafdsa-922c-4568-85a5-e5cc77efc3be",
+            "key": "testExisting_temail",
+            "name": "testExisting_temail",
+            "lastPublishedDate": "0001-01-01T00:00:00",
+            "description": "",
+            "version": 2,
+            "workflowApiVersion": 1,
+            "createdDate": "2022-03-24T02:20:32.74",
+            "modifiedDate": "2022-03-24T02:20:40.45",
+            "goals": [],
+            "exits": [],
+            "notifiers": [],
+            "entryMode": "MultipleEntries",
+            "definitionType": "Transactional",
+            "channel": "email",
+            "defaults": {
+                "properties": {
+                    "analyticsTracking": {
+                        "enabled": false,
+                        "analyticsType": "google",
+                        "urlDomainsToTrack": []
+                    }
+                }
+            },
+            "metaData": {},
+            "executionMode": "Production",
+            "categoryId": 6298,
+            "status": "Published",
+            "scheduledStatus": "Draft",
+            "definitionId": "dsfdsafdsa-922c-4568-85a5-e5cc77efc3be"
+        }
+    ]
+}

package/test/type.asset.test.js

@@ -443,7 +443,7 @@ describe('type: asset', () => {
             const deployResult = await handler.deploy(
                 'testInstance/testBU',
                 ['asset'],
-                ['testExisting_asset_htmlblock-matchName']
+                ['testExisting_asset_html-matchName']
             );
             // THEN
             assert.equal(process.exitCode, 0, 'deploy should not have thrown an error');
@@ -464,8 +464,8 @@ describe('type: asset', () => {
             );
             assert.equal(
                 upsertCallout?.customerKey,
-                'testExisting_asset_htmlblock-matchName',
-                'customerKey should be testExisting_asset_htmlblock-matchName'
+                'testExisting_asset_html-matchName',
+                'customerKey should be testExisting_asset_html-matchName'
             );
             assert.equal(
                 upsertCallout?.id,
@@ -487,7 +487,7 @@ describe('type: asset', () => {
             const deployResult = await handler.deploy(
                 'testInstance/testBU',
                 ['asset'],
-                ['testExisting_asset_htmlblock-matchName-fail']
+                ['testExisting_asset_html-matchNamFail']
             );
             // THEN
             assert.equal(process.exitCode, 1, 'deploy should have thrown an error');
@@ -518,7 +518,7 @@ describe('type: asset', () => {
             const deployResult = await handler.deploy(
                 'testInstance/testBU',
                 ['asset'],
-                ['testExisting_asset_htmlblock-matchName-create']
+                ['testExisting_asset_html-matchNameAdd']
             );
             // THEN
             assert.equal(process.exitCode, 0, 'deploy should not have thrown an error');
@@ -535,8 +535,8 @@ describe('type: asset', () => {
             const upsertCallout = testUtils.getRestCallout('post', '/asset/v1/content/assets/');
             assert.equal(
                 upsertCallout?.customerKey,
-                'testExisting_asset_htmlblock-matchName-create',
-                'asset.customerKey should be testExisting_asset_htmlblock-matchName-create'
+                'testExisting_asset_html-matchNameAdd',
+                'asset.customerKey should be testExisting_asset_html-matchNameAdd'
             );
             assert.equal(
                 upsertCallout?.id,

package/test/type.automation.test.js

@@ -58,7 +58,7 @@ describe('type: automation', () => {
             );
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                33,
+                34,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -144,7 +144,7 @@ describe('type: automation', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                51,
+                52,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -212,7 +212,7 @@ describe('type: automation', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                55,
+                56,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -279,7 +279,7 @@ describe('type: automation', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                55,
+                56,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -318,7 +318,7 @@ describe('type: automation', () => {
             // check number of API calls
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                27,
+                28,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -362,7 +362,7 @@ describe('type: automation', () => {
             // check number of API calls
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                72,
+                74,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -406,7 +406,7 @@ describe('type: automation', () => {
             // check number of API calls
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                74,
+                76,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -450,7 +450,7 @@ describe('type: automation', () => {
             // check number of API calls
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                74,
+                76,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -494,7 +494,7 @@ describe('type: automation', () => {
             // check number of API calls
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                67,
+                69,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -538,7 +538,7 @@ describe('type: automation', () => {
             // check number of API calls
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                74,
+                76,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -582,7 +582,7 @@ describe('type: automation', () => {
             // check number of API calls
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                74,
+                76,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -626,7 +626,7 @@ describe('type: automation', () => {
             );
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                29,
+                30,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -670,7 +670,7 @@ describe('type: automation', () => {
             );
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                33,
+                34,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -681,7 +681,7 @@ describe('type: automation', () => {
             await handler.retrieve('testInstance/testBU');
             assert.equal(process.exitCode, 0, 'retrieve should not have thrown an error');
 
-            const expectedApiCallsRetrieve = 108;
+            const expectedApiCallsRetrieve = 109;
             assert.equal(
                 testUtils.getAPIHistoryLength(),
                 expectedApiCallsRetrieve,

package/test/type.dataFilter.test.js

@@ -81,7 +81,7 @@ describe('type: dataFilter', () => {
         it('Should create & upsert a dataFilter', async () => {
             // WHEN
 
-            await handler.deploy('testInstance/testBU', ['dataFilter']);
+            const deployed = await handler.deploy('testInstance/testBU', ['dataFilter']);
             // THEN
             assert.equal(process.exitCode, 0, 'deploy should not have thrown an error');
             // get results from cache
@@ -89,8 +89,16 @@ describe('type: dataFilter', () => {
             assert.equal(
                 result.dataFilter ? Object.keys(result.dataFilter).length : 0,
                 2,
-                'unexptected number of dataFilters in cache'
+                'unexpected number of dataFilters in cache'
             );
+            assert.equal(
+                deployed?.['testInstance/testBU']?.dataFilter
+                    ? Object.keys(deployed['testInstance/testBU'].dataFilter).length
+                    : 0,
+                2,
+                'unexpected number of dataFilters deployed'
+            );
+
             // confirm created item
             assert.deepEqual(
                 await testUtils.getActualJson('testNew_dataFilter', 'dataFilter'),