Skip to content

Commit 71a51fa

Browse files
shetzelshetzel
authored
Merge branch 'main' into bm/W-10774438
2 parents df436b7 + ef8f4c1 commit 71a51fa

File tree

14 files changed

+508
-135
lines changed

14 files changed

+508
-135
lines changed

‎.circleci/config.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,15 @@ workflows:
6666
sfdx_version: latest
6767
requires:
6868
- release-management/test-package
69+
context: na40-auth-url
6970
- release-management/test-nut:
7071
name: nuts-on-windows
7172
node_version: lts
7273
sfdx_version: latest
7374
os: windows
7475
requires:
7576
- release-management/test-package
77+
context: na40-auth-url
7678
- release-management/run-command-keyword:
7779
name: sandbox-nuts
7880
git_key_word: '[sb-nuts]'
@@ -81,6 +83,7 @@ workflows:
8183
requires:
8284
- nuts-on-windows
8385
- nuts-on-linux
86+
context: na40-auth-url
8487
- release-management/release-package:
8588
sign: true
8689
github-release: true
@@ -92,6 +95,7 @@ workflows:
9295
context:
9396
- CLI_CTC
9497
- AWS
98+
- release
9599
test-ts-update:
96100
triggers:
97101
- schedule:
@@ -116,6 +120,7 @@ workflows:
116120
- linux
117121
- windows
118122
npm_module_name: << pipeline.parameters.npm_module_name >>
123+
context: na40-auth-url
119124
dependabot-automerge:
120125
triggers:
121126
- schedule:
@@ -125,4 +130,5 @@ workflows:
125130
only:
126131
- main
127132
jobs:
128-
- release-management/dependabot-automerge
133+
- release-management/dependabot-automerge:
134+
context: release

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [1.12.0](https://github.com/salesforcecli/plugin-org/compare/v1.11.2...v1.12.0) (2022-04-22)
6+
7+
### Features
8+
9+
- new command org:status ([9524fb6](https://github.com/salesforcecli/plugin-org/commit/9524fb67285cf608d4f7a4dd9c11b2475f643866))
10+
11+
### Bug Fixes
12+
13+
- for set alias ([99c77f0](https://github.com/salesforcecli/plugin-org/commit/99c77f0be12df5c03ee8b1f11e7c9425910ec1b1))
14+
515
### [1.11.2](https://github.com/salesforcecli/plugin-org/compare/v1.11.1...v1.11.2) (2022-02-21)
616

717
### Bug Fixes

‎README.md‎

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ sfdx plugins
8383
- [`sfdx force:org:display [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorgdisplay--u-string---apiversion-string---verbose---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
8484
- [`sfdx force:org:list [--all] [-p --clean] [--skipconnectionstatus] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorglist---all--p---clean---skipconnectionstatus---verbose---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
8585
- [`sfdx force:org:open [-b <string> | -r] [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorgopen--b-string---r--p-string--u-string---apiversion-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
86+
- [`sfdx force:org:status -n <string> [-s] [-a <string>] [-w <minutes>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forceorgstatus--n-string--s--a-string--w-minutes--u-string---apiversion-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
8687

8788
## `sfdx force:org:beta:create [name=value...] [-t scratch|sandbox] [-f <filepath>] [-n] [-c] [-i <string>] [-s] [-a <string>] [-w <minutes>] [-d <integer>] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
8889

@@ -149,7 +150,7 @@ EXAMPLES
149150
$ sfdx force:org:create -t sandbox -f config/dev-sandbox-def.json -a MyDevSandbox -u prodOrg
150151
```
151152

152-
_See code: [src/commands/force/org/beta/create.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/beta/create.ts)_
153+
_See code: [src/commands/force/org/beta/create.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.2/src/commands/force/org/beta/create.ts)_
153154

154155
## `sfdx force:org:delete [-p] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
155156

@@ -185,7 +186,7 @@ EXAMPLES
185186
$ sfdx force:org:delete -u MyOrgAlias -p
186187
```
187188

188-
_See code: [src/commands/force/org/delete.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/delete.ts)_
189+
_See code: [src/commands/force/org/delete.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.2/src/commands/force/org/delete.ts)_
189190

190191
## `sfdx force:org:display [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
191192

@@ -226,7 +227,7 @@ EXAMPLES
226227
sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json
227228
```
228229

229-
_See code: [src/commands/force/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/display.ts)_
230+
_See code: [src/commands/force/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.2/src/commands/force/org/display.ts)_
230231

231232
## `sfdx force:org:list [--all] [-p --clean] [--skipconnectionstatus] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
232233

@@ -262,7 +263,7 @@ EXAMPLES
262263
sfdx force:org:list --verbose --json > tmp/MyOrgList.json
263264
```
264265

265-
_See code: [src/commands/force/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/list.ts)_
266+
_See code: [src/commands/force/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.2/src/commands/force/org/list.ts)_
266267

267268
## `sfdx force:org:open [-b <string> | -r] [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
268269

@@ -307,6 +308,54 @@ EXAMPLES
307308
sfdx force:org:open -u [email protected] -b firefox
308309
```
309310

310-
_See code: [src/commands/force/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.1/src/commands/force/org/open.ts)_
311+
_See code: [src/commands/force/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.2/src/commands/force/org/open.ts)_
312+
313+
## `sfdx force:org:status -n <string> [-s] [-a <string>] [-w <minutes>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
314+
315+
report status of sandbox creation or clone and authenticate to it
316+
317+
```
318+
USAGE
319+
$ sfdx force:org:status -n <string> [-s] [-a <string>] [-w <minutes>] [-u <string>] [--apiversion <string>] [--json]
320+
[--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
321+
322+
OPTIONS
323+
-a, --setalias=setalias alias for the created or cloned org
324+
325+
-n, --sandboxname=sandboxname (required) name of the sandbox org
326+
to check status for
327+
328+
-s, --setdefaultusername set the created or cloned org as
329+
your default
330+
331+
-u, --targetusername=targetusername username or alias for the target
332+
org; overrides default target org
333+
334+
-w, --wait=wait [default: 6 minutes] number of
335+
minutes to wait while polling for
336+
status
337+
338+
--apiversion=apiversion override the api version used for
339+
api requests made by this command
340+
341+
--json format output as json
342+
343+
--loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL) [default: warn] logging level for
344+
this command invocation
345+
346+
DESCRIPTION
347+
Use this command to check the status of your sandbox creation or clone and, if the sandbox is ready, authenticate to
348+
it.
349+
Use the --wait (-w) parameter to specify the number of minutes that the command waits for the sandbox creation or
350+
clone to complete before returning control of the terminal to you.
351+
Set the --targetusername (-u) parameter to the username or alias of the production org that contains the sandbox
352+
license.
353+
354+
EXAMPLES
355+
sfdx force:org:status --sandboxname DevSbx1 --setalias MySandbox -u prodOrg
356+
sfdx force:org:status --sandboxname DevSbx1 --wait 45 --setdefaultusername -u prodOrg
357+
```
358+
359+
_See code: [src/commands/force/org/status.ts](https://github.com/salesforcecli/plugin-org/blob/v1.11.2/src/commands/force/org/status.ts)_
311360

312361
<!-- commandsstop -->

‎command-snapshot.json‎

Lines changed: 85 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,86 @@
11
[
2-
{
3-
"command": "force:org:beta:create",
4-
"plugin": "@salesforce/plugin-org",
5-
"flags": [
6-
"apiversion",
7-
"clientid",
8-
"definitionfile",
9-
"durationdays",
10-
"json",
11-
"loglevel",
12-
"noancestors",
13-
"nonamespace",
14-
"retry",
15-
"setalias",
16-
"setdefaultusername",
17-
"targetdevhubusername",
18-
"targetusername",
19-
"type",
20-
"wait"
21-
]
22-
},
23-
{
24-
"command": "force:org:delete",
25-
"plugin": "@salesforce/plugin-org",
26-
"flags": ["apiversion", "json", "loglevel", "noprompt", "targetdevhubusername", "targetusername"]
27-
},
28-
{
29-
"command": "force:org:display",
30-
"plugin": "@salesforce/plugin-org",
31-
"flags": ["apiversion", "json", "loglevel", "targetusername", "verbose"]
32-
},
33-
{
34-
"command": "force:org:list",
35-
"plugin": "@salesforce/plugin-org",
36-
"flags": ["all", "clean", "json", "loglevel", "noprompt", "skipconnectionstatus", "verbose"]
37-
},
38-
{
39-
"command": "force:org:open",
40-
"plugin": "@salesforce/plugin-org",
41-
"flags": ["apiversion", "browser", "json", "loglevel", "path", "targetusername", "urlonly"]
42-
}
43-
]
2+
{
3+
"command": "force:org:beta:create",
4+
"plugin": "@salesforce/plugin-org",
5+
"flags": [
6+
"apiversion",
7+
"clientid",
8+
"definitionfile",
9+
"durationdays",
10+
"json",
11+
"loglevel",
12+
"noancestors",
13+
"nonamespace",
14+
"retry",
15+
"setalias",
16+
"setdefaultusername",
17+
"targetdevhubusername",
18+
"targetusername",
19+
"type",
20+
"wait"
21+
]
22+
},
23+
{
24+
"command": "force:org:delete",
25+
"plugin": "@salesforce/plugin-org",
26+
"flags": [
27+
"apiversion",
28+
"json",
29+
"loglevel",
30+
"noprompt",
31+
"targetdevhubusername",
32+
"targetusername"
33+
]
34+
},
35+
{
36+
"command": "force:org:display",
37+
"plugin": "@salesforce/plugin-org",
38+
"flags": [
39+
"apiversion",
40+
"json",
41+
"loglevel",
42+
"targetusername",
43+
"verbose"
44+
]
45+
},
46+
{
47+
"command": "force:org:list",
48+
"plugin": "@salesforce/plugin-org",
49+
"flags": [
50+
"all",
51+
"clean",
52+
"json",
53+
"loglevel",
54+
"noprompt",
55+
"skipconnectionstatus",
56+
"verbose"
57+
]
58+
},
59+
{
60+
"command": "force:org:open",
61+
"plugin": "@salesforce/plugin-org",
62+
"flags": [
63+
"apiversion",
64+
"browser",
65+
"json",
66+
"loglevel",
67+
"path",
68+
"targetusername",
69+
"urlonly"
70+
]
71+
},
72+
{
73+
"command": "force:org:status",
74+
"plugin": "@salesforce/plugin-org",
75+
"flags": [
76+
"apiversion",
77+
"json",
78+
"loglevel",
79+
"sandboxname",
80+
"setalias",
81+
"setdefaultusername",
82+
"targetusername",
83+
"wait"
84+
]
85+
}
86+
]

‎messages/status.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"examples": [
3+
"sfdx force:org:status --sandboxname DevSbx1 --setalias MySandbox -u prodOrg",
4+
"sfdx force:org:status --sandboxname DevSbx1 --wait 45 --setdefaultusername -u prodOrg"
5+
],
6+
"description": "report status of sandbox creation or clone and authenticate to it\nUse this command to check the status of your sandbox creation or clone and, if the sandbox is ready, authenticate to it.\nUse the --wait (-w) parameter to specify the number of minutes that the command waits for the sandbox creation or clone to complete before returning control of the terminal to you.\nSet the --targetusername (-u) parameter to the username or alias of the production org that contains the sandbox license.",
7+
"flags": {
8+
"sandboxname": "name of the sandbox org to check status for",
9+
"wait": "number of minutes to wait while polling for status",
10+
"setdefaultusername": "set the created or cloned org as your default",
11+
"setalias": "alias for the created or cloned org"
12+
}
13+
}

‎package.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@salesforce/plugin-org",
33
"description": "A template repository for sfdx plugins",
4-
"version": "1.11.2",
4+
"version": "1.12.0",
55
"author": "Salesforce",
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
88
"@oclif/config": "^1.18.1",
99
"@salesforce/command": "^4.2.2",
10-
"@salesforce/core": "^2.35.0",
10+
"@salesforce/core": "^2.36.3",
1111
"@salesforce/kit": "^1.5.17",
1212
"open": "8.4.0",
1313
"tslib": "^2"
@@ -43,11 +43,15 @@
4343
"nyc": "^15.1.0",
4444
"prettier": "^2.4.1",
4545
"pretty-quick": "^3.1.0",
46+
"shelljs": "^0.8.5",
4647
"shx": "0.3.4",
4748
"sinon": "10.0.0",
4849
"ts-node": "^10.0.0",
4950
"typescript": "^4.4.4"
5051
},
52+
"resolutions": {
53+
"@salesforce/core": "^2.36.3"
54+
},
5155
"config": {
5256
"commitizen": {
5357
"path": "cz-conventional-changelog"

0 commit comments

Comments
 (0)