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

fix: support toolbelt suffixes #428

Merged
merged 10 commits into from
Aug 18, 2021
Merged

Conversation

mshanemc
Copy link
Contributor

@mshanemc mshanemc commented Aug 17, 2021

What does this PR do?

toolbelt had two differences with SDR on metadata suffixes. This changes adds an additional suffix key pointing to the correct metadata type for index (big object indexes, child of customObject) and customwebpagelink.

For top-level type (customwebpagelink, not indexes) this also adds a new registry type property called legacySuffix. If that exists, the destination xml location does a replace to swap out the suffix (the existing code was just sliceing off meta-xml which would preserve incorrect suffixes even when SDR knew the proper type. That should provide deployable, corrected output for convert and deploy commands.

This should have no effect on any other metadata types where there is no legacySuffix provided.

What issues does this PR fix or reference?

forcedotcom/cli#1141 , @W-9771788@ @W-9762131@

AC: files should deploy with either or both suffix/types
files with the toolbelt type should retrieve/merge into the existing file
newly retrieved files should only use the new, correct SDR suffixes

please test source:convert with this

@mshanemc mshanemc requested review from a team as code owners August 17, 2021 22:39
@mshanemc mshanemc requested a review from xyc August 17, 2021 22:39
Copy link
Member

@WillieRuemmele WillieRuemmele left a comment

Choose a reason for hiding this comment

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

CustomPageWebLink:

  • image
  • is able to deploy both suffixes (above)
  • CANNOT deploy .custompageweblink suffix without a .weblink file -> "An object 'test' of type CustomPageWebLink was named in package.xml, but was not found in zipped directory"
  • retrieve will create a .weblink file
  • retrieve won't override a .custompageweblik to .weblink

Index:

  • deploy works with test repo on this SDR branch, fails on develop
  • source:convert works
  • source:convert -> mdapi:convert will throw Unexpected file found in package directory: /Users/william.ruemmele/projects/scratches/github1141-big-object-index/force-app/main/default/objects/Test__b/indexes/TestIndex.index-meta.xml
  • change that file it complains about above to use .indexe and it works
  • retrieve works
  • SDR will retrieve and write as indexe and index

@WillieRuemmele
Copy link
Member

Now able to deploy singular .custompageweblink file

@WillieRuemmele WillieRuemmele merged commit ad4883b into develop Aug 18, 2021
@WillieRuemmele WillieRuemmele deleted the sm/toolbelt-compatibility branch August 18, 2021 23:10
AnanyaJha pushed a commit that referenced this pull request Aug 19, 2021
* fix: force fullName to CustomLabels

* chore: update prop name

* fix: backward support for toolbelt suffix differences

* Revert "fix: backward support for toolbelt suffix differences"

This reverts commit 9cf9505.

* fix: support toolbelt suffixes

* feat: support legacy suffix conversion

Co-authored-by: Mike Donnalley <[email protected]>
Co-authored-by: Willie Ruemmele <[email protected]>
shetzel added a commit that referenced this pull request Aug 20, 2021
* fix: export all public TS types and interfaces (#423)

* fix: making exports in the right format

@W-9727845@

* chore: removing yarn changes

* fix: xml nodes might not be arrays (#424)

Co-authored-by: Willie Ruemmele <[email protected]>

* fix: throw an error for unexpected child types (#426)

* fix: throw an error for unexpected child types

* fix: throw better error when transforming invalid child

* fix: ensure valid children during retrieve

Co-authored-by: Willie Ruemmele <[email protected]>

* fix: force fullName to CustomLabels (#427)

* fix: force fullName to CustomLabels

* chore: update prop name

* fix: backward support for toolbelt suffix differences

* Revert "fix: backward support for toolbelt suffix differences"

This reverts commit 9cf9505.

Co-authored-by: mshanemc <[email protected]>
Co-authored-by: Willie Ruemmele <[email protected]>

* fix: forceIgnore does not work for `SFDX: Retrieve Source in Manifest from Org` in vscode extension (#413)

* fix: forceIgnore does not work with retrieve manifest

* fix: matchingContent subfolder

* Wr/content type of undefined (#429)

* chore: initial pass on preventing improperly structured static resources

* chore: added error message

Co-authored-by: Shane McLaughlin <[email protected]>

* fix: support toolbelt suffixes (#428)

* fix: force fullName to CustomLabels

* chore: update prop name

* fix: backward support for toolbelt suffix differences

* Revert "fix: backward support for toolbelt suffix differences"

This reverts commit 9cf9505.

* fix: support toolbelt suffixes

* feat: support legacy suffix conversion

Co-authored-by: Mike Donnalley <[email protected]>
Co-authored-by: Willie Ruemmele <[email protected]>

Co-authored-by: vamsimundra <[email protected]>
Co-authored-by: Shane McLaughlin <[email protected]>
Co-authored-by: Willie Ruemmele <[email protected]>
Co-authored-by: Steve Hetzel <[email protected]>
Co-authored-by: Mike Donnalley <[email protected]>
Co-authored-by: Violet Yao <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants