Skip to content

Commit 5bc32c8

Browse files
WillieRuemmeleWillieRuemmele
authored
fix: .customPermissions vs .customPermission (the MD type) (#1534)
1 parent bfceb37 commit 5bc32c8

File tree

14 files changed

+76
-12
lines changed

14 files changed

+76
-12
lines changed

‎src/convert/transformers/decomposedPermissionSetTransformer.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ import { AnyJson, ensureString, JsonMap } from '@salesforce/ts-types';
1010
import type { PermissionSet } from '@jsforce/jsforce-node/lib/api/metadata/schema';
1111
import { calculateRelativePath } from '../../utils/path';
1212
import { unwrapAndOmitNS } from '../../utils/decomposed';
13-
import type { MetadataComponent } from '../../resolve/types';
14-
import { type MetadataType } from '../../registry/types';
15-
import { SourceComponent } from '../../resolve/sourceComponent';
13+
import type { MetadataType } from '../../registry';
14+
import { SourceComponent, type MetadataComponent } from '../../resolve';
1615
import { JsToXml } from '../streams';
1716
import type { ToSourceFormatInput, WriteInfo, XmlObj } from '../types';
18-
import { META_XML_SUFFIX, XML_NS_KEY, XML_NS_URL } from '../../common/constants';
19-
import type { SourcePath } from '../../common/types';
17+
import { META_XML_SUFFIX, XML_NS_KEY, XML_NS_URL, type SourcePath } from '../../common';
2018
import { BaseMetadataTransformer } from './baseMetadataTransformer';
2119
import {
2220
addChildType,

‎src/registry/presets/decomposePermissionSetBeta2.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"applicationvisibility": "permissionset",
44
"classaccess": "permissionset",
55
"custommetadatatypeaccess": "permissionset",
6-
"custompermission": "permissionset",
6+
"custompermissions": "permissionset",
77
"customsettingaccess": "permissionset",
88
"externalcredentialprincipalaccess": "permissionset",
99
"externaldatasourceaccess": "permissionset",
@@ -28,7 +28,7 @@
2828
"applicationVisibilities": "applicationvisibility",
2929
"classAccesses": "classaccess",
3030
"customMetadataTypeAccesses": "custommetadatatypeaccess",
31-
"customPermissions": "custompermission",
31+
"customPermissions": "custompermissions",
3232
"customSettingAccesses": "customsettingaccess",
3333
"externalCredentialPrincipalAccesses": "externalcredentialprincipalaccess",
3434
"externalDataSourceAccesses": "externaldatasourceaccess",
@@ -44,7 +44,7 @@
4444
"applicationVisibility": "applicationvisibility",
4545
"classAccess": "classaccess",
4646
"customMetadataTypeAccess": "custommetadatatypeaccess",
47-
"customPermission": "custompermission",
47+
"customPermissions": "custompermissions",
4848
"customSettingAccess": "customsettingaccess",
4949
"externalCredentialPrincipalAccess": "externalcredentialprincipalaccess",
5050
"externalDataSourceAccess": "externaldatasourceaccess",
@@ -82,12 +82,12 @@
8282
"suffix": "customMetadataTypeAccess",
8383
"uniqueIdElement": "name"
8484
},
85-
"custompermission": {
85+
"custompermissions": {
8686
"directoryName": "",
87-
"id": "custompermission",
87+
"id": "custompermissions",
88+
"name": "CustomPermissions",
8889
"isAddressable": false,
89-
"name": "CustomPermission",
90-
"suffix": "customPermission",
90+
"suffix": "customPermissions",
9191
"uniqueIdElement": "name"
9292
},
9393
"customsettingaccess": {

‎test/snapshot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-md-files.expected/customPermissions/MYCP.customPermission

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomPermission xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<isLicensed>false</isLicensed>
4+
<label>MYCP</label>
5+
<requiredPermission>
6+
<customPermission>MYCP2</customPermission>
7+
<dependency>true</dependency>
8+
</requiredPermission>
9+
</CustomPermission>

‎test/snapshot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-md-files.expected/customPermissions/MYCP2.customPermission

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomPermission xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<isLicensed>false</isLicensed>
4+
<label>MYCP2</label>
5+
</CustomPermission>

‎test/snapshot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-md-files.expected/package.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<types>
4+
<members>MYCP</members>
5+
<members>MYCP2</members>
6+
<name>CustomPermission</name>
7+
</types>
38
<types>
49
<members>dreamhouse</members>
510
<members>ebikes</members>

‎test/snapshot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-source-files.expected/force-app/main/default/customPermissions/MYCP.customPermission-meta.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomPermission xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<isLicensed>false</isLicensed>
4+
<label>MYCP</label>
5+
<requiredPermission>
6+
<customPermission>MYCP2</customPermission>
7+
<dependency>true</dependency>
8+
</requiredPermission>
9+
</CustomPermission>

‎test/snapshot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-source-files.expected/force-app/main/default/customPermissions/MYCP2.customPermission-meta.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomPermission xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<isLicensed>false</isLicensed>
4+
<label>MYCP2</label>
5+
</CustomPermission>

‎test/snapshot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-source-files.expected/force-app/main/default/permissionsets/withCustomPermission/withCustomPermission.customPermission-meta.xml renamed to ‎test/snapshot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-source-files.expected/force-app/main/default/permissionsets/withCustomPermission/withCustomPermission.customPermissions-meta.xml

File renamed without changes.

‎test/snapshot/sampleProjects/preset-decomposedPS2/force-app/main/default/customPermissions/MYCP.customPermission-meta.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomPermission xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<isLicensed>false</isLicensed>
4+
<label>MYCP</label>
5+
<requiredPermission>
6+
<customPermission>MYCP2</customPermission>
7+
<dependency>true</dependency>
8+
</requiredPermission>
9+
</CustomPermission>

‎test/snapshot/sampleProjects/preset-decomposedPS2/force-app/main/default/customPermissions/MYCP2.customPermission-meta.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomPermission xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<isLicensed>false</isLicensed>
4+
<label>MYCP2</label>
5+
</CustomPermission>

‎test/snapshot/sampleProjects/preset-decomposedPS2/force-app/main/default/permissionsets/withCustomPermission/withCustomPermission.customPermission-meta.xml renamed to ‎test/snapshot/sampleProjects/preset-decomposedPS2/force-app/main/default/permissionsets/withCustomPermission/withCustomPermission.customPermissions-meta.xml

File renamed without changes.

‎test/snapshot/sampleProjects/preset-decomposedPS2/mdapiOutput/customPermissions/MYCP.customPermission

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomPermission xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<isLicensed>false</isLicensed>
4+
<label>MYCP</label>
5+
<requiredPermission>
6+
<customPermission>MYCP2</customPermission>
7+
<dependency>true</dependency>
8+
</requiredPermission>
9+
</CustomPermission>

‎test/snapshot/sampleProjects/preset-decomposedPS2/mdapiOutput/customPermissions/MYCP2.customPermission

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CustomPermission xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<isLicensed>false</isLicensed>
4+
<label>MYCP2</label>
5+
</CustomPermission>

‎test/snapshot/sampleProjects/preset-decomposedPS2/mdapiOutput/package.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<types>
4+
<members>MYCP</members>
5+
<members>MYCP2</members>
6+
<name>CustomPermission</name>
7+
</types>
38
<types>
49
<members>dreamhouse</members>
510
<members>ebikes</members>

0 commit comments

Comments
 (0)