fix(resolver): ignore non-component XML files in project #1452
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cristiand391
changed the title
cristiand391
commented
Nov 4, 2024
| if (!suffixType) return false; | ||
|
|
||
| const matchesSuffixType = fsPath.split(sep).includes(suffixType.directoryName); | ||
| if (matchesSuffixType) return matchesSuffixType; |
There was a problem hiding this comment.
for an XML file, suffixType would return the emailservicesfunction entry:
cristiand391
commented
Nov 4, 2024
| // it might be a type that requires strict parent folder name. | ||
| const strictFolderSuffixType = registry | ||
| .getStrictFolderTypes() | ||
| .find((l) => l.suffix === suffixType.suffix && l.directoryName && l.name !== suffixType.name); |
There was a problem hiding this comment.
if registry.getTypeBySuffix entry didn't match, check for strictFolderTypes.
snapshot tests caught an issue with CustomSite where getTypeBySuffix would return sitedotcom (no match with the directoryName), this will return the strict folder types -> find if one with directoryName and suffix matches (and isn't suffixType).
shetzel
approved these changes
Nov 4, 2024
|
Manual tests with the changes passed. I added a UT that fails without the changes so if CI is green we can merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Updates the metadata resolver to ignore XML files in a project that aren't part of a source component.
A customer had datapacks with an XML file that isn't part of the metadata inside
force_app, when SDR built the component to deploy a specific metadata it would try to resolve the XML file asemailservicesfunctionbecause the helpers to detect if a filepath was a metadata type were checking if the file suffix matched one in the registry (emailservicesfunction.suffix === 'xml').This PR updates
isMetadatato first try to find the type based on the suffix, if it there's not then it will check forstrictDirectoryNamestype ones and theirdirectoryName.Repro:
sf project list ignoredsf project deploy start -m ApexClassemailservicesfunctionxml, then step 4 works b/c it doesn't try to resolve it as a component.What issues does this PR fix or reference?
@W-17113942@