Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sm/status-shows-ignores #258

Merged
merged 44 commits into from
Oct 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6e6942e
fix: show conflicts from both remote and local, including remote file…
mshanemc Oct 7, 2021
524aca5
test: better output, workaroun for Audience type
mshanemc Oct 7, 2021
9c2504c
fix: push gets its own formatter for json reasons
mshanemc Oct 11, 2021
25a9473
fix: missing pull messages
mshanemc Oct 11, 2021
1c65488
chore: bump SDR to 4.5.7 (#253)
WillieRuemmele Oct 11, 2021
5b60b4a
chore(release): 1.2.3 [ci skip]
Oct 11, 2021
055aed6
Updated/Added CODEOWNERS with ECCN
svc-scm Oct 12, 2021
ef527a9
chore(release): 1.2.4 [ci skip]
Oct 12, 2021
4b01ad3
chore: sync .gitignore [skip-validate-pr] (#251)
Oct 12, 2021
9542a72
test: parallelize nuts, exclude async deploy nut
mshanemc Oct 14, 2021
ce89056
feat: mark ignores
mshanemc Oct 14, 2021
74813b6
Merge branch 'sm/conflicts-for-labels' into sm/status-shows-ignores
mshanemc Oct 14, 2021
7b22865
feat: status shows remote ignores
mshanemc Oct 18, 2021
06408a7
refactor: consistent naming of command classes
mshanemc Oct 18, 2021
79380b8
refactor: push feedback
mshanemc Oct 18, 2021
5d32ca6
style: comment is no longer a question
mshanemc Oct 18, 2021
5cba146
test: ebikes from clone instead of fs
mshanemc Oct 18, 2021
f9b37e3
fix: status flags are better
mshanemc Oct 18, 2021
6444789
test: nuts with conn adjusted for git checkout
mshanemc Oct 18, 2021
1123f5a
Merge branch 'sm/conflicts-for-labels' into sm/source-tracking-beta
mshanemc Oct 18, 2021
6f0ced3
chore: bump sdr for Created state fix
mshanemc Oct 18, 2021
455bd1e
test: unignore profiles
mshanemc Oct 18, 2021
3fcf98f
test: was not using ebikes, revert
mshanemc Oct 18, 2021
695336a
chore: change status' flags in snapshot
mshanemc Oct 18, 2021
1334eda
refactor: move status logic to STL
mshanemc Oct 19, 2021
abe020c
test: update ignore nut
mshanemc Oct 20, 2021
6c9d550
Merge branch 'sm/push-json' into sm/status-shows-ignores
mshanemc Oct 20, 2021
8ee541a
Merge branch 'sm/source-tracking-beta' into sm/status-shows-ignores
mshanemc Oct 20, 2021
8a6bc74
style: formatting line length
mshanemc Oct 20, 2021
ef2d662
fix: push uses correct json
mshanemc Oct 20, 2021
67fb9f9
test: update tests for new push json format
mshanemc Oct 20, 2021
0da51c5
test: ut on lts, not node17
mshanemc Oct 20, 2021
e18c197
Wr/destructive deploy (#230)
WillieRuemmele Oct 21, 2021
4a47789
chore(release): 1.2.5 [ci skip]
Oct 21, 2021
76627fb
fix: use cross-env for test:nuts script (#260)
shetzel Oct 21, 2021
84396b7
chore(release): 1.2.6 [ci skip]
Oct 21, 2021
76cadc8
chore: unhide beta commands
mshanemc Oct 22, 2021
6f2496b
chore: bump SDR and STL
mshanemc Oct 22, 2021
152d0cd
Merge remote-tracking branch 'origin/main' into sm/status-shows-ignores
mshanemc Oct 22, 2021
f3c71ca
test: and tracking nuts
mshanemc Oct 22, 2021
bb0b30a
ci: windows UT
mshanemc Oct 22, 2021
27c8f7f
test: nuts are hub-auth-agnostic
mshanemc Oct 22, 2021
77e5e7b
ci: windows only
mshanemc Oct 22, 2021
2b29e0a
ci: restore windows tests
mshanemc Oct 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 16 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,29 +52,32 @@ workflows:
- linux
- windows
node_version:
- latest
# - latest
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

node latest is v17 and there's an temporary issue with that

- lts
- maintenance
exclude:
- os: windows
node_version: lts
- os: windows
node_version: maintenance
- release-management/test-nut:
name: nuts-on-linux
node_version: lts
size: large
sfdx_version: latest
requires:
- release-management/test-package
- release-management/test-nut:
name: nuts-on-windows
sfdx_version: latest
size: large
node_version: lts
os: windows
size: large
requires:
- release-management/test-package
matrix:
parameters:
os:
- linux
- windows
command:
- 'yarn test:nuts:convert'
- 'yarn test:nuts:delete'
- 'yarn test:nuts:deploy'
- 'yarn test:nuts:manifest:create'
- 'yarn test:nuts:retrieve'
- 'yarn test:nuts:specialTypes'
- 'yarn test:nuts:deploy:destructive'
- 'yarn test:nuts:tracking'
- release-management/release-package:
sign: true
github-release: true
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
# @forcedotcom/pdt will be requested for
# review when someone opens a pull request.
* @forcedotcom/pdt
#ECCN:Open Source
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

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.

### [1.2.6](https://github.com/salesforcecli/plugin-source/compare/v1.2.5...v1.2.6) (2021-10-21)

### Bug Fixes

- use cross-env for test:nuts script ([#260](https://github.com/salesforcecli/plugin-source/issues/260)) ([76627fb](https://github.com/salesforcecli/plugin-source/commit/76627fb21c62a4fb140c87ccfc266accd79af3fd))

### [1.2.5](https://github.com/salesforcecli/plugin-source/compare/v1.2.4...v1.2.5) (2021-10-21)

### [1.2.4](https://github.com/salesforcecli/plugin-source/compare/v1.2.3...v1.2.4) (2021-10-12)

### [1.2.3](https://github.com/salesforcecli/plugin-source/compare/v1.2.1...v1.2.3) (2021-10-11)

### Bug Fixes

- add back missing long parameter descriptions for some force:source commands ([#241](https://github.com/salesforcecli/plugin-source/issues/241)) ([d87671b](https://github.com/salesforcecli/plugin-source/commit/d87671b4987317d395873d6ef382e6a3ca2080e5))
- remote-only deletes now supported ([#220](https://github.com/salesforcecli/plugin-source/issues/220)) ([fed3ff4](https://github.com/salesforcecli/plugin-source/commit/fed3ff496e732c6b960ae5838ea302e6b51e9029))

### [1.2.1](https://github.com/salesforcecli/plugin-source/compare/v1.2.0...v1.2.1) (2021-10-05)

### Bug Fixes
Expand Down
49 changes: 33 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ $ npm install -g @salesforce/plugin-source
$ sfdx COMMAND
running command...
$ sfdx (-v|--version|version)
@salesforce/plugin-source/1.2.0 linux-x64 node-v12.22.6
@salesforce/plugin-source/1.2.5 linux-x64 node-v12.22.7
$ sfdx --help [COMMAND]
USAGE
$ sfdx COMMAND
Expand All @@ -96,7 +96,7 @@ USAGE

- [`sfdx force:source:convert [-r <directory>] [-d <directory>] [-n <string>] [-p <array> | -x <string> | -m <array>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forcesourceconvert--r-directory--d-directory--n-string--p-array---x-string---m-array---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
- [`sfdx `](#sfdx-)
- [`sfdx force:source:deploy [--soapdeploy] [-w <minutes>] [-q <id> | -x <filepath> | -m <array> | -p <array> | -c | -l NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg | -r <array> | -o | -g] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forcesourcedeploy---soapdeploy--w-minutes--q-id---x-filepath---m-array---p-array---c---l-notestrunrunspecifiedtestsrunlocaltestsrunalltestsinorg---r-array---o---g--u-string---apiversion-string---verbose---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
- [`sfdx force:source:deploy [--soapdeploy] [-w <minutes>] [-q <id> | -x <filepath> | -m <array> | -p <array> | -c | -l NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg | -r <array> | -o | -g] [--predestructivechanges <filepath> ] [--postdestructivechanges <filepath> ] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forcesourcedeploy---soapdeploy--w-minutes--q-id---x-filepath---m-array---p-array---c---l-notestrunrunspecifiedtestsrunlocaltestsrunalltestsinorg---r-array---o---g---predestructivechanges-filepath----postdestructivechanges-filepath---u-string---apiversion-string---verbose---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
- [`sfdx force:source:deploy:cancel [-w <minutes>] [-i <id>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forcesourcedeploycancel--w-minutes--i-id--u-string---apiversion-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
- [`sfdx force:source:deploy:report [-w <minutes>] [-i <id>] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forcesourcedeployreport--w-minutes--i-id--u-string---apiversion-string---verbose---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
- [`sfdx force:source:manifest:create [-m <array> | -p <array>] [-n <string> | -t pre|post|destroy|package] [-o <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-forcesourcemanifestcreate--m-array---p-array--n-string---t-prepostdestroypackage--o-string---apiversion-string---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
Expand All @@ -123,7 +123,7 @@ USAGE

OPTIONS
-d, --outputdir=outputdir [default:
metadataPackage_1633397509876]
metadataPackage_1634849032196]
output directory to store the
Metadata API–formatted files in

Expand Down Expand Up @@ -161,7 +161,7 @@ EXAMPLES
$ sfdx force:source:convert -r path/to/source -d path/to/outputdir -n 'My Package'
```

_See code: [src/commands/force/source/convert.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.0/src/commands/force/source/convert.ts)_
_See code: [src/commands/force/source/convert.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.5/src/commands/force/source/convert.ts)_

## `sfdx `

Expand Down Expand Up @@ -217,9 +217,9 @@ EXAMPLES
$ sfdx force:source:delete -p path/to/source
```

_See code: [src/commands/force/source/delete.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.0/src/commands/force/source/delete.ts)_
_See code: [src/commands/force/source/delete.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.5/src/commands/force/source/delete.ts)_

## `sfdx force:source:deploy [--soapdeploy] [-w <minutes>] [-q <id> | -x <filepath> | -m <array> | -p <array> | -c | -l NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg | -r <array> | -o | -g] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
## `sfdx force:source:deploy [--soapdeploy] [-w <minutes>] [-q <id> | -x <filepath> | -m <array> | -p <array> | -c | -l NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg | -r <array> | -o | -g] [--predestructivechanges <filepath> ] [--postdestructivechanges <filepath> ] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`

deploy source to an org

Expand All @@ -235,12 +235,13 @@ To run the command asynchronously, set --wait to 0, which immediately returns th
To check the status of the job, use force:source:deploy:report.

If the comma-separated list you’re supplying contains spaces, enclose the entire comma-separated list in one set of double quotes. On Windows, if the list contains commas, also enclose the entire list in one set of double quotes.

If you use the --manifest, --predestructivechanges, or --postdestructivechanges parameters, run the force:source:manifest:create command to easily generate the different types of manifest files.

USAGE
$ sfdx force:source:deploy [--soapdeploy] [-w <minutes>] [-q <id> | -x <filepath> | -m <array> | -p <array> | -c | -l
NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg | -r <array> | -o | -g] [-u <string>] [--apiversion
<string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg | -r <array> | -o | -g] [--predestructivechanges <filepath>
] [--postdestructivechanges <filepath> ] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel
trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]

OPTIONS
-c, --checkonly validate deploy but don’t save to
Expand Down Expand Up @@ -284,6 +285,16 @@ OPTIONS
--loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL) [default: warn] logging level for
this command invocation

--postdestructivechanges=postdestructivechanges file path for a manifest
(destructiveChangesPost.xml) of
components to delete after the
deploy

--predestructivechanges=predestructivechanges file path for a manifest
(destructiveChangesPre.xml) of
components to delete before the
deploy

--soapdeploy deploy metadata with SOAP API
instead of REST API

Expand All @@ -303,6 +314,8 @@ DESCRIPTION

If the comma-separated list you’re supplying contains spaces, enclose the entire comma-separated list in one set of
double quotes. On Windows, if the list contains commas, also enclose the entire list in one set of double quotes.
If you use the --manifest, --predestructivechanges, or --postdestructivechanges parameters, run the
force:source:manifest:create command to easily generate the different types of manifest files.

EXAMPLES
To deploy the source files in a directory:
Expand All @@ -326,10 +339,14 @@ EXAMPLES
To check whether a deployment would succeed (to prepare for Quick Deploy):
$ sfdx force:source:deploy -m ApexClass -l RunAllTestsInOrg -c
To deploy an already validated deployment (Quick Deploy):
$ sfdx force:source:deploy -q 0Af9A00000FTM6pSAH`,
$ sfdx force:source:deploy -q 0Af9A00000FTM6pSAH`
To run a destructive operation before the deploy occurs:
$ sfdx force:source:deploy --manifest package.xml --predestructivechanges destructiveChangesPre.xml
To run a destructive operation after the deploy occurs:
$ sfdx force:source:deploy --manifest package.xml --postdestructivechanges destructiveChangesPost.xml
```

_See code: [src/commands/force/source/deploy.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.0/src/commands/force/source/deploy.ts)_
_See code: [src/commands/force/source/deploy.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.5/src/commands/force/source/deploy.ts)_

## `sfdx force:source:deploy:cancel [-w <minutes>] [-i <id>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`

Expand Down Expand Up @@ -384,7 +401,7 @@ EXAMPLES
$ sfdx force:source:deploy:report
```

_See code: [src/commands/force/source/deploy/cancel.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.0/src/commands/force/source/deploy/cancel.ts)_
_See code: [src/commands/force/source/deploy/cancel.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.5/src/commands/force/source/deploy/cancel.ts)_

## `sfdx force:source:deploy:report [-w <minutes>] [-i <id>] [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`

Expand Down Expand Up @@ -434,7 +451,7 @@ EXAMPLES
$ sfdx force:source:deploy:report
```

_See code: [src/commands/force/source/deploy/report.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.0/src/commands/force/source/deploy/report.ts)_
_See code: [src/commands/force/source/deploy/report.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.5/src/commands/force/source/deploy/report.ts)_

## `sfdx force:source:manifest:create [-m <array> | -p <array>] [-n <string> | -t pre|post|destroy|package] [-o <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`

Expand Down Expand Up @@ -513,7 +530,7 @@ EXAMPLES
$ sfdx force:source:manifest:create --sourcepath force-app --manifestname myNewManifest
```

_See code: [src/commands/force/source/manifest/create.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.0/src/commands/force/source/manifest/create.ts)_
_See code: [src/commands/force/source/manifest/create.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.5/src/commands/force/source/manifest/create.ts)_

## `sfdx force:source:open -f <filepath> [-r] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`

Expand Down Expand Up @@ -563,7 +580,7 @@ EXAMPLES
$ sfdx force:source:open -f path/to/source -u [email protected]
```

_See code: [src/commands/force/source/open.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.0/src/commands/force/source/open.ts)_
_See code: [src/commands/force/source/open.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.5/src/commands/force/source/open.ts)_

## `sfdx force:source:retrieve [-p <array> | -x <filepath> | -m <array>] [-w <minutes>] [-n <array>] [-u <string>] [-a <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`

Expand Down Expand Up @@ -651,6 +668,6 @@ EXAMPLES
$ sfdx force:source:retrieve -n MyPackageName -x path/to/package.xml
```

_See code: [src/commands/force/source/retrieve.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.0/src/commands/force/source/retrieve.ts)_
_See code: [src/commands/force/source/retrieve.ts](https://github.com/salesforcecli/plugin-source/blob/v1.2.5/src/commands/force/source/retrieve.ts)_

<!-- commandsstop -->
4 changes: 3 additions & 1 deletion command-snapshot.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
"command": "force:source:beta:status",
"plugin": "@salesforce/plugin-source",
"flags": ["all", "apiversion", "json", "local", "loglevel", "remote", "targetusername"]
"flags": ["apiversion", "json", "local", "loglevel", "remote", "targetusername"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we able to remove the 'all' flag without deprecation?

},
{
"command": "force:source:beta:tracking:clear",
Expand Down Expand Up @@ -58,6 +58,8 @@
"loglevel",
"manifest",
"metadata",
"postdestructivechanges",
"predestructivechanges",
"runtests",
"soapdeploy",
"sourcepath",
Expand Down
Loading