diff --git a/README.md b/README.md index e67ec2e6..490488f4 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ Assign a permission set to one or more users of a scratch org. ``` USAGE - $ sf org assign permset -n -o [--json] [-b ] [--api-version ] + $ sf org assign permset -n -o [--json] [--flags-dir ] [-b ] [--api-version ] FLAGS -b, --on-behalf-of=... Username or alias to assign the permission set to. @@ -110,7 +110,8 @@ FLAGS --api-version= Override the api version used for api requests made by this command GLOBAL FLAGS - --json Format output as json. + --flags-dir= Import flag values from a directory. + --json Format output as json. DESCRIPTION Assign a permission set to one or more users of a scratch org. @@ -144,7 +145,8 @@ Assign a permission set license to one or more users of a scratch org. ``` USAGE - $ sf org assign permsetlicense -n -o [--json] [-b ] [--api-version ] + $ sf org assign permsetlicense -n -o [--json] [--flags-dir ] [-b ] [--api-version + ] FLAGS -b, --on-behalf-of=... Usernames or alias to assign the permission set license to. @@ -153,7 +155,8 @@ FLAGS --api-version= Override the api version used for api requests made by this command GLOBAL FLAGS - --json Format output as json. + --flags-dir= Import flag values from a directory. + --json Format output as json. DESCRIPTION Assign a permission set license to one or more users of a scratch org. @@ -188,7 +191,8 @@ Create a user for a scratch org. ``` USAGE - $ sf org create user -o [--json] [-a ] [-f ] [-s] [--api-version ] + $ sf org create user -o [--json] [--flags-dir ] [-a ] [-f ] [-s] [--api-version + ] FLAGS -a, --set-alias= Set an alias for the created username to reference in other CLI commands. @@ -200,7 +204,8 @@ FLAGS --api-version= Override the api version used for api requests made by this command GLOBAL FLAGS - --json Format output as json. + --flags-dir= Import flag values from a directory. + --json Format output as json. DESCRIPTION Create a user for a scratch org. @@ -294,7 +299,7 @@ Display information about a Salesforce user. ``` USAGE - $ sf org display user -o [--json] [--api-version ] + $ sf org display user -o [--json] [--flags-dir ] [--api-version ] FLAGS -o, --target-org= (required) Username or alias of the target org. Not required if the `target-org` @@ -302,7 +307,8 @@ FLAGS --api-version= Override the api version used for api requests made by this command GLOBAL FLAGS - --json Format output as json. + --flags-dir= Import flag values from a directory. + --json Format output as json. DESCRIPTION Display information about a Salesforce user. @@ -332,7 +338,8 @@ Generate a random password for scratch org users. ``` USAGE - $ sf org generate password -o [--json] [-b ] [-l ] [-c ] [--api-version ] + $ sf org generate password -o [--json] [--flags-dir ] [-b ] [-l ] [-c ] + [--api-version ] FLAGS -b, --on-behalf-of=... Comma-separated list of usernames or aliases to assign the password to; must have been @@ -346,7 +353,8 @@ FLAGS --api-version= Override the api version used for api requests made by this command GLOBAL FLAGS - --json Format output as json. + --flags-dir= Import flag values from a directory. + --json Format output as json. DESCRIPTION Generate a random password for scratch org users. @@ -397,7 +405,7 @@ List all locally-authenticated users of an org. ``` USAGE - $ sf org list users -o [--json] [--api-version ] + $ sf org list users -o [--json] [--flags-dir ] [--api-version ] FLAGS -o, --target-org= (required) Username or alias of the target org. Not required if the `target-org` @@ -405,7 +413,8 @@ FLAGS --api-version= Override the api version used for api requests made by this command GLOBAL FLAGS - --json Format output as json. + --flags-dir= Import flag values from a directory. + --json Format output as json. DESCRIPTION List all locally-authenticated users of an org. diff --git a/command-snapshot.json b/command-snapshot.json index 6856e8d6..c76293de 100644 --- a/command-snapshot.json +++ b/command-snapshot.json @@ -4,7 +4,7 @@ "command": "force:user:password:generate", "flagAliases": ["apiversion", "onbehalfof", "targetusername"], "flagChars": ["c", "l", "o", "u"], - "flags": ["api-version", "complexity", "json", "length", "loglevel", "on-behalf-of", "target-org"], + "flags": ["api-version", "complexity", "flags-dir", "json", "length", "loglevel", "on-behalf-of", "target-org"], "plugin": "@salesforce/plugin-user" }, { @@ -12,7 +12,7 @@ "command": "force:user:permset:assign", "flagAliases": ["apiversion", "onbehalfof", "permsetname", "targetusername"], "flagChars": ["n", "o", "u"], - "flags": ["api-version", "json", "loglevel", "on-behalf-of", "perm-set-name", "target-org"], + "flags": ["api-version", "flags-dir", "json", "loglevel", "on-behalf-of", "perm-set-name", "target-org"], "plugin": "@salesforce/plugin-user" }, { @@ -20,7 +20,7 @@ "command": "force:user:permsetlicense:assign", "flagAliases": ["apiversion", "onbehalfof", "perm-set-license", "psl", "targetusername"], "flagChars": ["b", "n", "u"], - "flags": ["api-version", "json", "loglevel", "name", "on-behalf-of", "target-org"], + "flags": ["api-version", "flags-dir", "json", "loglevel", "name", "on-behalf-of", "target-org"], "plugin": "@salesforce/plugin-user" }, { @@ -28,7 +28,7 @@ "command": "org:assign:permset", "flagAliases": ["onbehalfof", "permsetname"], "flagChars": ["b", "n", "o"], - "flags": ["api-version", "json", "name", "on-behalf-of", "target-org"], + "flags": ["api-version", "flags-dir", "json", "name", "on-behalf-of", "target-org"], "plugin": "@salesforce/plugin-user" }, { @@ -36,7 +36,7 @@ "command": "org:assign:permsetlicense", "flagAliases": ["onbehalfof", "perm-set-license", "psl"], "flagChars": ["b", "n", "o"], - "flags": ["api-version", "json", "name", "on-behalf-of", "target-org"], + "flags": ["api-version", "flags-dir", "json", "name", "on-behalf-of", "target-org"], "plugin": "@salesforce/plugin-user" }, { @@ -44,7 +44,16 @@ "command": "org:create:user", "flagAliases": ["apiversion", "definitionfile", "setalias", "setuniqueusername", "targetusername", "u"], "flagChars": ["a", "f", "o", "s"], - "flags": ["api-version", "definition-file", "json", "loglevel", "set-alias", "set-unique-username", "target-org"], + "flags": [ + "api-version", + "definition-file", + "flags-dir", + "json", + "loglevel", + "set-alias", + "set-unique-username", + "target-org" + ], "plugin": "@salesforce/plugin-user" }, { @@ -52,7 +61,7 @@ "command": "org:display:user", "flagAliases": ["apiversion", "targetusername", "u"], "flagChars": ["o"], - "flags": ["api-version", "json", "loglevel", "target-org"], + "flags": ["api-version", "flags-dir", "json", "loglevel", "target-org"], "plugin": "@salesforce/plugin-user" }, { @@ -60,7 +69,7 @@ "command": "org:generate:password", "flagAliases": ["onbehalfof"], "flagChars": ["b", "c", "l", "o"], - "flags": ["api-version", "complexity", "json", "length", "on-behalf-of", "target-org"], + "flags": ["api-version", "complexity", "flags-dir", "json", "length", "on-behalf-of", "target-org"], "plugin": "@salesforce/plugin-user" }, { @@ -68,7 +77,7 @@ "command": "org:list:users", "flagAliases": ["apiversion", "targetusername", "u"], "flagChars": ["o"], - "flags": ["api-version", "json", "loglevel", "target-org"], + "flags": ["api-version", "flags-dir", "json", "loglevel", "target-org"], "plugin": "@salesforce/plugin-user" } ] diff --git a/package.json b/package.json index b37fde13..96e83e86 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@oclif/core": "^3.23.0", "@salesforce/core": "^6.7.1", "@salesforce/kit": "^3.0.15", - "@salesforce/sf-plugins-core": "^7.1.14", + "@salesforce/sf-plugins-core": "^8.0.1", "@salesforce/ts-types": "^2.0.9" }, "devDependencies": { diff --git a/test/df17AppBuilding/data/Volunteer_Event__cs.json b/test/df17AppBuilding/data/Volunteer_Event__cs.json index da6baf23..59862cb2 100644 --- a/test/df17AppBuilding/data/Volunteer_Event__cs.json +++ b/test/df17AppBuilding/data/Volunteer_Event__cs.json @@ -1,34 +1,34 @@ { - "records": [ - { - "attributes": { - "type": "Volunteer_Event__c", - "referenceId": "Volunteer_Event__cRef1" - }, - "Name": "Reading to Kids at Vis Valley Elementary", - "Description__c": "

It's our monthly trip to read books for the kindergartners again!

We'll take some of our favorite books...dress as yourselves!

", - "End__c": "2017-09-18T18:00:00.000+0000", - "Start__c": "2017-09-18T15:00:00.000+0000" - }, - { - "attributes": { - "type": "Volunteer_Event__c", - "referenceId": "Volunteer_Event__cRef2" - }, - "Name": "Animal Adoption Fair", - "Description__c": "Help people find their next pet from the shelter...we need staff to welcome people, help them complete paperwork, take animals for microchipping, and maintain order", - "End__c": "2017-09-18T18:00:00.000+0000", - "Start__c": "2017-09-18T15:00:00.000+0000" - }, - { - "attributes": { - "type": "Volunteer_Event__c", - "referenceId": "Volunteer_Event__cRef3" - }, - "Name": "Trail Maintenance", - "Description__c": "We need 7 people for some outdoor work--trimming branches and vines and removing roots that might trip people on the local park trails", - "End__c": "2017-09-18T18:00:00.000+0000", - "Start__c": "2017-09-18T15:00:00.000+0000" - } - ] -} \ No newline at end of file + "records": [ + { + "attributes": { + "type": "Volunteer_Event__c", + "referenceId": "Volunteer_Event__cRef1" + }, + "Name": "Reading to Kids at Vis Valley Elementary", + "Description__c": "

It's our monthly trip to read books for the kindergartners again!

We'll take some of our favorite books...dress as yourselves!

", + "End__c": "2017-09-18T18:00:00.000+0000", + "Start__c": "2017-09-18T15:00:00.000+0000" + }, + { + "attributes": { + "type": "Volunteer_Event__c", + "referenceId": "Volunteer_Event__cRef2" + }, + "Name": "Animal Adoption Fair", + "Description__c": "Help people find their next pet from the shelter...we need staff to welcome people, help them complete paperwork, take animals for microchipping, and maintain order", + "End__c": "2017-09-18T18:00:00.000+0000", + "Start__c": "2017-09-18T15:00:00.000+0000" + }, + { + "attributes": { + "type": "Volunteer_Event__c", + "referenceId": "Volunteer_Event__cRef3" + }, + "Name": "Trail Maintenance", + "Description__c": "We need 7 people for some outdoor work--trimming branches and vines and removing roots that might trip people on the local park trails", + "End__c": "2017-09-18T18:00:00.000+0000", + "Start__c": "2017-09-18T15:00:00.000+0000" + } + ] +} diff --git a/test/df17AppBuilding/data/masterImportPlan.json b/test/df17AppBuilding/data/masterImportPlan.json index d3bc52c1..6855d00a 100644 --- a/test/df17AppBuilding/data/masterImportPlan.json +++ b/test/df17AppBuilding/data/masterImportPlan.json @@ -1,11 +1,8 @@ [ - { - "sobject": "Volunteer_Event__c", - "saveRefs": true, - "resolveRefs": false, - "files": [ - "Volunteer_Event__cs.json" - ] - } - -] \ No newline at end of file + { + "sobject": "Volunteer_Event__c", + "saveRefs": true, + "resolveRefs": false, + "files": ["Volunteer_Event__cs.json"] + } +] diff --git a/yarn.lock b/yarn.lock index f1d5d5b1..4a0fb4cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,7 +1307,7 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@oclif/core@3.25.2", "@oclif/core@^3.15.1", "@oclif/core@^3.19.2", "@oclif/core@^3.19.6", "@oclif/core@^3.20.0", "@oclif/core@^3.21.0", "@oclif/core@^3.23.0": +"@oclif/core@3.25.2", "@oclif/core@^3.15.1", "@oclif/core@^3.19.2", "@oclif/core@^3.20.0", "@oclif/core@^3.21.0", "@oclif/core@^3.23.0": version "3.25.2" resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.25.2.tgz#a26d56abe5686c57c1e973957777bd2ae324e973" integrity sha512-OkW/cNa/3DhoCz2YlSpymVe8DXqkoRaLY4SPTVqNVzR4R1dFBE5KoCtuwKwnhxYLCRCqaViPgRnB5K26f0MnjA== @@ -1404,7 +1404,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.0" -"@salesforce/core@^6.4.1", "@salesforce/core@^6.6.0", "@salesforce/core@^6.7.0", "@salesforce/core@^6.7.1", "@salesforce/core@^6.7.3": +"@salesforce/core@^6.4.1", "@salesforce/core@^6.7.0", "@salesforce/core@^6.7.1", "@salesforce/core@^6.7.3": version "6.7.3" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.7.3.tgz#5d8f30c40ac3cebb898c8e845fe9a067bc729268" integrity sha512-uU+PuZZGXxByhvnXLH1V3eY5P1caw401dIZ/QvhzYxoP/alPLk7dpChnZNJYH5Rw3dc/AhSPw+eg0cvUyjhP1Q== @@ -1510,15 +1510,15 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/sf-plugins-core@^7.1.14": - version "7.1.14" - resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-7.1.14.tgz#5f07316a602b4c5d44c09bc74c294d7df9e2e260" - integrity sha512-KDX9vYDeVOkozRrsjVh4Pvzay++7bWWKmaHtGOwkZrBHb3mVEdCp0ryF0WaDTfaEvgNKn7kiZEDSO7oEhJSzug== +"@salesforce/sf-plugins-core@^8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-8.0.1.tgz#f155cddfd7695aab0d8264848b634b2a91cdbf2c" + integrity sha512-R6SqJ1XqSINSWdZruKtC2SKGnLBh7KbFI7+qS0FYlyPU4IlWoa+AZkGwWvlczuSOumqnlhT95rNKwZTS5rJugA== dependencies: "@inquirer/confirm" "^2.0.17" "@inquirer/password" "^1.1.16" - "@oclif/core" "^3.19.6" - "@salesforce/core" "^6.6.0" + "@oclif/core" "^3.23.0" + "@salesforce/core" "^6.7.3" "@salesforce/kit" "^3.0.15" "@salesforce/ts-types" "^2.0.9" chalk "^5.3.0"