salesforcecli · mshanemc · Feb 9, 2024 · Feb 5, 2024
diff --git a/command-snapshot.json b/command-snapshot.json
@@ -1,100 +1,74 @@
 [
   {
-    "command": "force:user:password:generate",
-    "plugin": "@salesforce/plugin-user",
-    "flags": [
-      "api-version",
-      "complexity",
-      "json",
-      "length",
-      "loglevel",
-      "on-behalf-of",
-      "target-dev-hub",
-      "target-org"
-    ],
     "alias": [],
-    "flagChars": ["c", "l", "o", "u", "v"],
-    "flagAliases": ["apiversion", "onbehalfof", "targetdevhubusername", "targetusername"]
+    "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"],
+    "plugin": "@salesforce/plugin-user"
   },
   {
-    "command": "force:user:permset:assign",
-    "plugin": "@salesforce/plugin-user",
-    "flags": ["api-version", "json", "loglevel", "on-behalf-of", "perm-set-name", "target-org"],
     "alias": [],
+    "command": "force:user:permset:assign",
+    "flagAliases": ["apiversion", "onbehalfof", "permsetname", "targetusername"],
     "flagChars": ["n", "o", "u"],
-    "flagAliases": ["apiversion", "onbehalfof", "permsetname", "targetusername"]
+    "flags": ["api-version", "json", "loglevel", "on-behalf-of", "perm-set-name", "target-org"],
+    "plugin": "@salesforce/plugin-user"
   },
   {
-    "command": "force:user:permsetlicense:assign",
-    "plugin": "@salesforce/plugin-user",
-    "flags": ["api-version", "json", "loglevel", "name", "on-behalf-of", "target-org"],
     "alias": [],
+    "command": "force:user:permsetlicense:assign",
+    "flagAliases": ["apiversion", "onbehalfof", "perm-set-license", "psl", "targetusername"],
     "flagChars": ["b", "n", "u"],
-    "flagAliases": ["apiversion", "onbehalfof", "perm-set-license", "psl", "targetusername"]
+    "flags": ["api-version", "json", "loglevel", "name", "on-behalf-of", "target-org"],
+    "plugin": "@salesforce/plugin-user"
   },
   {
-    "command": "org:assign:permset",
-    "plugin": "@salesforce/plugin-user",
-    "flags": ["api-version", "json", "name", "on-behalf-of", "target-org"],
     "alias": [],
+    "command": "org:assign:permset",
+    "flagAliases": ["onbehalfof", "permsetname"],
     "flagChars": ["b", "n", "o"],
-    "flagAliases": ["onbehalfof", "permsetname"]
+    "flags": ["api-version", "json", "name", "on-behalf-of", "target-org"],
+    "plugin": "@salesforce/plugin-user"
   },
   {
-    "command": "org:assign:permsetlicense",
-    "plugin": "@salesforce/plugin-user",
-    "flags": ["api-version", "json", "name", "on-behalf-of", "target-org"],
     "alias": [],
+    "command": "org:assign:permsetlicense",
+    "flagAliases": ["onbehalfof", "perm-set-license", "psl"],
     "flagChars": ["b", "n", "o"],
-    "flagAliases": ["onbehalfof", "perm-set-license", "psl"]
+    "flags": ["api-version", "json", "name", "on-behalf-of", "target-org"],
+    "plugin": "@salesforce/plugin-user"
   },
   {
-    "command": "org:create:user",
-    "plugin": "@salesforce/plugin-user",
-    "flags": [
-      "api-version",
-      "definition-file",
-      "json",
-      "loglevel",
-      "set-alias",
-      "set-unique-username",
-      "target-dev-hub",
-      "target-org"
-    ],
     "alias": ["force:user:create"],
-    "flagChars": ["a", "f", "o", "s", "v"],
-    "flagAliases": [
-      "apiversion",
-      "definitionfile",
-      "setalias",
-      "setuniqueusername",
-      "targetdevhubusername",
-      "targetusername",
-      "u"
-    ]
+    "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"],
+    "plugin": "@salesforce/plugin-user"
   },
   {
-    "command": "org:display:user",
-    "plugin": "@salesforce/plugin-user",
-    "flags": ["api-version", "json", "loglevel", "target-dev-hub", "target-org"],
     "alias": ["force:user:display"],
-    "flagChars": ["o", "v"],
-    "flagAliases": ["apiversion", "targetdevhubusername", "targetusername", "u"]
+    "command": "org:display:user",
+    "flagAliases": ["apiversion", "targetusername", "u"],
+    "flagChars": ["o"],
+    "flags": ["api-version", "json", "loglevel", "target-org"],
+    "plugin": "@salesforce/plugin-user"
   },
   {
-    "command": "org:generate:password",
-    "plugin": "@salesforce/plugin-user",
-    "flags": ["api-version", "complexity", "json", "length", "on-behalf-of", "target-org"],
     "alias": [],
+    "command": "org:generate:password",
+    "flagAliases": ["onbehalfof"],
     "flagChars": ["b", "c", "l", "o"],
-    "flagAliases": ["onbehalfof"]
+    "flags": ["api-version", "complexity", "json", "length", "on-behalf-of", "target-org"],
+    "plugin": "@salesforce/plugin-user"
   },
   {
-    "command": "org:list:users",
-    "plugin": "@salesforce/plugin-user",
-    "flags": ["api-version", "json", "loglevel", "target-dev-hub", "target-org"],
     "alias": ["force:user:list"],
-    "flagChars": ["o", "v"],
-    "flagAliases": ["apiversion", "targetusername", "u"]
+    "command": "org:list:users",
+    "flagAliases": ["apiversion", "targetusername", "u"],
+    "flagChars": ["o"],
+    "flags": ["api-version", "json", "loglevel", "target-org"],
+    "plugin": "@salesforce/plugin-user"
   }
 ]
@@ -74,10 +74,6 @@ The username "%s" already exists in this or another Salesforce org. Usernames mu
 Successfully created user "%s" with ID %s for org %s.%s
 See more details about this user by running "%s org user display -o %s".
 
-# flags.target-hub.deprecation
-
-The --target-dev-hub flag is deprecated and is no longer used by this command. The flag will be removed in API version 57.0 or later.
-
 # error.nonScratchOrg
 
 This command works with only scratch orgs.

@@ -23,8 +23,3 @@ Sharing this information is equivalent to logging someone in under the current c
 access and escalation of privilege.
 For additional information, review the authorization section of
 the https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_auth_web_flow.htm
-
-# flags.target-hub.deprecation
-
-The --target-dev-hub flag is deprecated and is no longer used by this command. The flag will be removed in API version
-57.0 or later.
@@ -15,11 +15,3 @@ For scratch orgs, the list includes any users you've created with the "org creat
 - List the locally-authenticated users of the specified org:
 
   <%= config.bin %> <%= command.id %> --target-org [email protected]
-
-# flags.target-dev-hub.summary
-
-Username or alias of the Dev Hub org.
-
-# flags.target-dev-hub.deprecation
-
-The --target-dev-hub flag is deprecated and is no longer used by this command. The flag will be removed in API version 57.0 or later.
@@ -90,7 +90,3 @@ Scratch org alias or login user.
 
 Found a comma-separated list of usernames or aliases for the --on-behalf-of flag. Either specify one per flag or
 separate by a space.
-
-# flags.target-hub.deprecation
-
-The --target-dev-hub flag is deprecated and is no longer used by this command. The flag will be removed in API version 57.0 or later.
diff --git a/src/baseCommands/user/password/generate.ts b/src/baseCommands/user/password/generate.ts
@@ -6,11 +6,10 @@
  */
 import { EOL } from 'node:os';
 
-
 import { SfCommand } from '@salesforce/sf-plugins-core';
 import { AuthInfo, Connection, Messages, Org, SfError, StateAggregator, User } from '@salesforce/core';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
 
 export type PasswordData = {

diff --git a/src/baseCommands/user/permset/assign.ts b/src/baseCommands/user/permset/assign.ts
@@ -5,12 +5,10 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
-
 import { Connection, Messages, Org, SfError, StateAggregator, User } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 
 type SuccessMsg = {
   name: string;

diff --git a/src/baseCommands/user/permsetlicense/assign.ts b/src/baseCommands/user/permsetlicense/assign.ts
@@ -5,12 +5,10 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
-
 import { Connection, Logger, Messages, SfError, StateAggregator } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permsetlicense.assign');
 
 type SuccessMsg = {

diff --git a/src/commands/force/user/password/generate.ts b/src/commands/force/user/password/generate.ts
@@ -5,13 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import {
-  arrayWithDeprecation,
-  Flags,
-  loglevel,
-  optionalHubFlagWithDeprecations,
-  orgApiVersionFlagWithDeprecations,
-} from '@salesforce/sf-plugins-core';
+import { arrayWithDeprecation, Flags, loglevel, orgApiVersionFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import { ensureArray } from '@salesforce/kit';
 import { GenerateResult, UserPasswordGenerateBaseCommand } from '../../../../baseCommands/user/password/generate.js';
@@ -50,13 +44,6 @@ export class ForceUserPasswordGenerateCommand extends UserPasswordGenerateBaseCo
       max: 5,
       default: 5,
     }),
-    'target-dev-hub': {
-      ...optionalHubFlagWithDeprecations,
-      hidden: true,
-      deprecated: {
-        message: messages.getMessage('flags.target-hub.deprecation'),
-      },
-    },
     'target-org': Flags.requiredOrg({
       char: 'u',
       summary: messages.getMessage('flags.target-org.summary'),

diff --git a/src/commands/org/assign/permset.ts b/src/commands/org/assign/permset.ts
@@ -5,14 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
-
 import { Messages, Org } from '@salesforce/core';
 import { Flags } from '@salesforce/sf-plugins-core';
 import { ensureArray } from '@salesforce/kit';
 import { PermsetAssignResult, UserPermSetAssignBaseCommand } from '../../../baseCommands/user/permset/assign.js';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permset.assign');
 
 export class AssignPermSetCommand extends UserPermSetAssignBaseCommand {

diff --git a/src/commands/org/assign/permsetlicense.ts b/src/commands/org/assign/permsetlicense.ts
@@ -5,14 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
-
 import { Messages } from '@salesforce/core';
 import { arrayWithDeprecation, Flags } from '@salesforce/sf-plugins-core';
 import { ensureArray } from '@salesforce/kit';
 import { PSLResult, UserPermSetLicenseAssignBaseCommand } from '../../../baseCommands/user/permsetlicense/assign.js';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permsetlicense.assign');
 
 export class AssignPermSetLicenseCommand extends UserPermSetLicenseAssignBaseCommand {

diff --git a/src/commands/org/create/user.ts b/src/commands/org/create/user.ts
@@ -27,7 +27,6 @@ import {
   loglevel,
   orgApiVersionFlagWithDeprecations,
   parseVarArgs,
-  optionalHubFlagWithDeprecations,
   requiredOrgFlagWithDeprecations,
   SfCommand,
 } from '@salesforce/sf-plugins-core';
@@ -74,13 +73,6 @@ export class CreateUserCommand extends SfCommand<CreateUserOutput> {
       aliases: ['setuniqueusername'],
       deprecateAliases: true,
     }),
-    'target-dev-hub': {
-      ...optionalHubFlagWithDeprecations,
-      hidden: true,
-      deprecated: {
-        message: messages.getMessage('flags.target-hub.deprecation'),
-      },
-    },
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,

diff --git a/src/commands/org/display/user.ts b/src/commands/org/display/user.ts
@@ -5,19 +5,16 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
-
 import { AuthFields, Connection, Logger, Messages, StateAggregator } from '@salesforce/core';
 import { ensureString } from '@salesforce/ts-types';
 import {
   loglevel,
-  optionalHubFlagWithDeprecations,
   orgApiVersionFlagWithDeprecations,
   requiredOrgFlagWithDeprecations,
   SfCommand,
 } from '@salesforce/sf-plugins-core';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'display');
 
 export type DisplayUserResult = {
@@ -39,13 +36,6 @@ export class DisplayUserCommand extends SfCommand<DisplayUserResult> {
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
   public static readonly flags = {
-    'target-dev-hub': {
-      ...optionalHubFlagWithDeprecations,
-      hidden: true,
-      deprecated: {
-        message: messages.getMessage('flags.target-hub.deprecation'),
-      },
-    },
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,

diff --git a/src/commands/org/generate/password.ts b/src/commands/org/generate/password.ts
@@ -5,13 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-
 import { Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import { ensureArray } from '@salesforce/kit';
 import { GenerateResult, UserPasswordGenerateBaseCommand } from '../../../baseCommands/user/password/generate.js';
 
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
 
 export type PasswordData = {

diff --git a/src/commands/org/list/users.ts b/src/commands/org/list/users.ts
@@ -7,7 +7,6 @@
 
 import { Connection, Messages, StateAggregator } from '@salesforce/core';
 import {
-  Flags,
   loglevel,
   orgApiVersionFlagWithDeprecations,
   requiredOrgFlagWithDeprecations,
@@ -43,14 +42,6 @@ export class ListUsersCommand extends SfCommand<ListUsers> {
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
   public static readonly flags = {
-    'target-dev-hub': Flags.optionalOrg({
-      char: 'v',
-      summary: messages.getMessage('flags.target-dev-hub.summary'),
-      hidden: true,
-      deprecated: {
-        message: messages.getMessage('flags.target-dev-hub.deprecation'),
-      },
-    }),
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,