fix: upgrade source deploy retrieve library to 2.1.1 #3147

sfsholden · 2021-04-13T21:48:07Z

What does this PR do?

Upgrades SDR to v2.0.0.

This includes registry changes and code restructuring with breaking API changes (fromSource, fromManifest).

What issues does this PR fix or reference?

#3114, #3157, @W-9102368@

codecov · 2021-04-13T21:48:13Z

Codecov Report

Merging #3147 (627f965) into release/v51.10.0 (4b0e011) will decrease coverage by 0.01%.
The diff coverage is 81.81%.

@@                 Coverage Diff                  @@
##           release/v51.10.0    #3147      +/-   ##
====================================================
- Coverage             76.17%   76.15%   -0.02%     
====================================================
  Files                   276      276              
  Lines                 10521    10513       -8     
  Branches               1236     1237       +1     
====================================================
- Hits                   8014     8006       -8     
+ Misses                 2158     2157       -1     
- Partials                349      350       +1

Impacted Files	Coverage Δ
...cedx-vscode-core/src/commands/baseDeployCommand.ts	`51.16% <0.00%> (+1.16%)`	⬆️
...scode-core/src/commands/util/parameterGatherers.ts	`83.07% <50.00%> (ø)`
...edx-vscode-core/src/commands/baseDeployRetrieve.ts	`90.51% <100.00%> (-1.73%)`	⬇️
...ode-core/src/commands/forceSourceDeployManifest.ts	`62.50% <100.00%> (ø)`
...e-core/src/commands/forceSourceDeploySourcePath.ts	`50.00% <100.00%> (-4.72%)`	⬇️
...e-core/src/commands/forceSourceRetrieveManifest.ts	`59.45% <100.00%> (ø)`
...ceSourceRetrieveMetadata/forceSourceRetrieveCmp.ts	`69.14% <100.00%> (-0.33%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4b0e011...627f965. Read the comment docs.

sfsholden · 2021-04-13T21:55:38Z

.../salesforcedx-vscode-core/src/commands/forceSourceRetrieveMetadata/forceSourceRetrieveCmp.ts

@@ -226,7 +228,7 @@ export class LibraryRetrieveSourcePathExecutor extends RetrieveExecutor<

 export async function forceSourceRetrieveCmp(
  trigger: RetrieveMetadataTrigger,
-  openAfterRetrieve: boolean = false


Only for trying to debug issues locally - this will be reverted.

sfsholden · 2021-04-13T21:56:52Z

.../salesforcedx-vscode-core/src/commands/forceSourceRetrieveMetadata/forceSourceRetrieveCmp.ts

+      include: filter
+    });
+    // If no results from local source components, return the filter.
+    return sourceResult.getSourceComponents().toArray().length === 0 ? filter : sourceResult;


This is important in the event that the source is not local. We would still want to make sure we have the results from the filter before continuing.

Good catch. A nice API for this would be something like the following in the library:

ComponentSet.fromMembers({ members: [ { fullName: 'MyClass', type: 'ApexClass' }, { fullName: 'MyClass2', type: 'ApexClass' } ], resolveSourcePaths: ['/path/to/force-app'] })

So that it always adds the members even if source wasn't found for them. CLI team requested this as well.

Ah nice, that seems much more intuitive.

packages/salesforcedx-vscode-core/src/commands/baseDeployCommand.ts

sfsholden · 2021-04-14T15:48:20Z

Pending the fix of one of the vscode integration tests.

package.json

packages/salesforcedx-vscode-core/src/commands/forceSourceDeploySourcePath.ts

lcampos · 2021-04-14T15:58:42Z

.../salesforcedx-vscode-core/src/commands/forceSourceRetrieveMetadata/forceSourceRetrieveCmp.ts

@@ -21,7 +21,7 @@ import {
  SourceComponent
 } from '@salesforce/source-deploy-retrieve';
 import { SourceRetrieveResult } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
-import { ComponentLike } from '@salesforce/source-deploy-retrieve/lib/src/common/types';
+import { ComponentLike } from '@salesforce/source-deploy-retrieve/lib/src/resolve/types';


Not for this PR, but we should expose these types (SourceRetrieveResult, ComponentLike, etc) at the top level of the library so we can import them just using @salesforce/source-deploy-retrieve.

lcampos · 2021-04-14T16:01:43Z

packages/salesforcedx-vscode-core/package.json

@@ -29,7 +29,7 @@
    "@salesforce/salesforcedx-sobjects-faux-generator": "51.9.0",
    "@salesforce/salesforcedx-utils-vscode": "51.9.0",
    "@salesforce/schemas": "^1",
-    "@salesforce/source-deploy-retrieve": "1.1.20",
+    "@salesforce/source-deploy-retrieve": "2.0.0",


FYI, @salesforce/source-deploy-retrieve is also used in the salesforcedx-vscode-apex module.

@lcampos I'll add a follow-up story for updating apex. It probably isn't wise to have two different versions in the extensions.

lcampos · 2021-04-20T17:36:28Z

@sfsholden @brpowell I think this PR is ready to merge but it's open against last week's release branch (release/v51.9.0). Are we using last week's release branch this week or will this PR be opened against release/v51.10.0 ?

sfsholden · 2021-04-20T17:47:49Z

@sfsholden @brpowell I think this PR is ready to merge but it's open against last week's release branch (release/v51.9.0). Are we using last week's release branch this week or will this PR be opened against release/v51.10.0 ?

We're thinking we'll use 51.10.0 and just skip 51.9.0 this week. I'll update this base branch once we can create 51.10.0.

sfsholden commented Apr 13, 2021

View reviewed changes

packages/salesforcedx-vscode-core/src/commands/baseDeployCommand.ts Outdated Show resolved Hide resolved

sfsholden added 10 commits April 13, 2021 16:29

chore: fix fromSource command calls

68123ca

chore: bump sdr version to 1.1.21

0a23566

chore: upgrade sdr to 2.0.0

4a7e6f3

chore: fix compilation errors

f13e6c4

test: changes in progress

cf07221

chore: add unzipper dependency

e8df0d6

test: fixing test issues

201d9c1

chore: fixing tslint complaints

2452651

chore: remove test line due to tslint

6250543

chore: fix potential regression from baseDeployCommand

31398c4

sfsholden force-pushed the sh/sdrUpgrade-2.0.0 branch from c53762c to 31398c4 Compare April 13, 2021 22:30

chore: cleanup

0d23736

sfsholden marked this pull request as ready for review April 14, 2021 15:48

sfsholden requested a review from a team as a code owner April 14, 2021 15:48

lcampos reviewed Apr 14, 2021

View reviewed changes

package.json Outdated Show resolved Hide resolved

lcampos reviewed Apr 14, 2021

View reviewed changes

packages/salesforcedx-vscode-core/src/commands/forceSourceDeploySourcePath.ts Outdated Show resolved Hide resolved

lcampos reviewed Apr 14, 2021

View reviewed changes

sfsholden changed the title ~~Sh/sdr upgrade 2.0.0~~ fix: upgrade source deploy retrieve library to 2.0.0 Apr 14, 2021

Bryan Powell and others added 3 commits April 14, 2021 18:43

test: update retrieve component test

d5f71dc

fix: unzipper types issue

966d7ad

chore: add Bryans feedback

4245a41

sfsholden changed the base branch from release/v51.9.0 to release/v51.10.0 April 20, 2021 22:02

chore: bump sdr to 2.1.1

627f965

brpowell approved these changes Apr 20, 2021

View reviewed changes

sfsholden merged commit e3ce502 into release/v51.10.0 Apr 20, 2021

sfsholden deleted the sh/sdrUpgrade-2.0.0 branch April 20, 2021 22:55

sfsholden changed the title ~~fix: upgrade source deploy retrieve library to 2.0.0~~ fix: upgrade source deploy retrieve library to 2.1.1 Apr 21, 2021

lukecotter pushed a commit to lukecotter/salesforcedx-vscode that referenced this pull request May 20, 2021

fix: upgrade source deploy retrieve library to 2.1.1 (forcedotcom#3147)

d7ccfef

snyk-bot mentioned this pull request Jun 14, 2022

[Snyk] Security upgrade lerna from 3.13.1 to 5.1.2 Sarrac3873/salesforcedx-vscode#99

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: upgrade source deploy retrieve library to 2.1.1 #3147

fix: upgrade source deploy retrieve library to 2.1.1 #3147

sfsholden commented Apr 13, 2021 •

edited

Loading

codecov bot commented Apr 13, 2021 •

edited

Loading

sfsholden Apr 13, 2021

sfsholden Apr 13, 2021

brpowell Apr 15, 2021 •

edited

Loading

sfsholden Apr 15, 2021

sfsholden commented Apr 14, 2021

lcampos Apr 14, 2021

lcampos Apr 14, 2021

sfsholden Apr 14, 2021

lcampos commented Apr 20, 2021

sfsholden commented Apr 20, 2021

fix: upgrade source deploy retrieve library to 2.1.1 #3147

fix: upgrade source deploy retrieve library to 2.1.1 #3147

Conversation

sfsholden commented Apr 13, 2021 • edited Loading

What does this PR do?

What issues does this PR fix or reference?

codecov bot commented Apr 13, 2021 • edited Loading

Codecov Report

sfsholden Apr 13, 2021

Choose a reason for hiding this comment

sfsholden Apr 13, 2021

Choose a reason for hiding this comment

brpowell Apr 15, 2021 • edited Loading

Choose a reason for hiding this comment

sfsholden Apr 15, 2021

Choose a reason for hiding this comment

sfsholden commented Apr 14, 2021

lcampos Apr 14, 2021

Choose a reason for hiding this comment

lcampos Apr 14, 2021

Choose a reason for hiding this comment

sfsholden Apr 14, 2021

Choose a reason for hiding this comment

lcampos commented Apr 20, 2021

sfsholden commented Apr 20, 2021

sfsholden commented Apr 13, 2021 •

edited

Loading

codecov bot commented Apr 13, 2021 •

edited

Loading

brpowell Apr 15, 2021 •

edited

Loading