Skip to content

Commit

Permalink
feat: show conflicts from both remote and local, including remote fil…
Browse files Browse the repository at this point in the history
…ename

* fix: show conflicts from both remote and local, including remote filename

* test: better output, workaroun for Audience type

* fix: push gets its own formatter for json reasons

* fix: missing pull messages

* chore: bump SDR to 4.5.7 (#253)

* chore(release): 1.2.3 [ci skip]

* Updated/Added CODEOWNERS with ECCN

* chore(release): 1.2.4 [ci skip]

* chore: sync .gitignore [skip-validate-pr] (#251)

Authored via Leif

* test: parallelize nuts, exclude async deploy nut

* test: one NUT for special types

* test: remove tracking NUTs

* ci: custom nut commands

* test: fix folderTypes, cross-env for windows

* test:  cross-env for windows SEED_FILTER, nyc only top-level

* ci: no sha; change nut order

* test: deploy nuts in parallel

* ci: disable async nuts

* test: exclude async nuts

* test: revert async-exclude

* test: revert tsconfig, revert config.yml

* test: exclude env for seeds

* feat: mark ignores

* feat: status shows remote ignores

* refactor: consistent naming of command classes

* refactor: push feedback

* style: comment is no longer a question

* test: ebikes from clone instead of fs

* fix: status flags are better

* test: nuts with conn adjusted for git checkout

* chore: bump sdr for Created state fix

* test: unignore profiles

* test: was not using ebikes, revert

* chore: change status' flags in snapshot

* refactor: move status logic to STL

* test: update ignore nut

* style: formatting line length

* fix: push uses correct json

* test: update tests for new push json format

* test: ut on lts, not node17

* Wr/destructive deploy (#230)

* fix: implementing destructive change deploy, 1 NUT

* chore: add NUTs, fix UTs

* chore: post-review board updates

* chore: fix linting

* chore: minor updates to flag logic, redo NUT query method

* chore: remove unnecessary checks in NUTs

* chore: bump SDR to 5, include deploy:destructive in NUTs

* chore(release): 1.2.5 [ci skip]

* fix: use cross-env for test:nuts script (#260)

* chore(release): 1.2.6 [ci skip]

* chore: unhide beta commands

* chore: bump SDR and STL

* test: and tracking nuts

* ci: windows UT

* test: nuts are hub-auth-agnostic

* ci: windows only

* ci: restore windows tests

Co-authored-by: Willie Ruemmele <[email protected]>
Co-authored-by: SF-CLI-BOT <[email protected]>
Co-authored-by: svc-scm <[email protected]>
Co-authored-by: Steve Hetzel <[email protected]>
  • Loading branch information
5 people authored Oct 23, 2021
1 parent 35875d0 commit c031b1f
Show file tree
Hide file tree
Showing 305 changed files with 753 additions and 11,892 deletions.
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
- 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
Validating CODEOWNERS rules …
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"]
},
{
"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

0 comments on commit c031b1f

Please sign in to comment.