fix(config/inherit): resolve presets #31642
Open
+188
−2
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
HonkingGoose
suggested changes
Sep 30, 2024
This comment was marked as resolved.
This comment was marked as resolved.
secustor
reviewed
Oct 2, 2024
HonkingGoose
suggested changes
Oct 7, 2024
Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
HonkingGoose
reviewed
Oct 9, 2024
Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>
rarkins
requested changes
Oct 11, 2024
rarkins
requested changes
Oct 17, 2024
| @@ -159,6 +159,19 @@ Inherited config may use all Repository config settings, and any Global config o | |||
|
|
|||
| For information on how the Mend Renovate App supports Inherited config, see the dedicated "Mend Renovate App Config" section toward the end of this page. | |||
|
|
|||
| #### Presets handling | |||
|
|
|||
| If the inherited config has presets, then Renovate: | |||
There was a problem hiding this comment.
Suggested change
| If the inherited config has presets, then Renovate: | |
| If the inherited config contains `extends` presets, then Renovate: |
There was a problem hiding this comment.
Suggested change
| If the inherited config has presets, then Renovate: | |
| If the inherited config contains `extends` presets, then Renovate will: |
| If the inherited config has presets, then Renovate: | ||
|
|
||
| 1. Resolves the presets | ||
| 1. Adds the resolved presets to the inherited config |
There was a problem hiding this comment.
Suggested change
| 1. Adds the resolved presets to the inherited config | |
| 1. Add resolved preset config at the beginning of the inherited config |
There was a problem hiding this comment.
Suggested change
| 1. Adds the resolved presets to the inherited config | |
| 1. Add the resolved preset config to the beginning of the inherited config |
Maybe this is better. If we go with @rarkins's suggestion, we should keep the the word. 😉
Comment on lines
+111
to
+116
| // Decrypt after resolving, in case the preset contains npm authentication | ||
| logger.debug('Resolving presets found in inherited config'); | ||
| const resolvedConfig = await decryptConfig( | ||
| await resolveConfigPresets(returnConfig, config, config.ignorePresets), | ||
| config.repository, | ||
| ); |
There was a problem hiding this comment.
npm presets have been deprecated for a long time, please remove this logic to simplify things
Comment on lines
+133
to
+138
| returnConfig = removeGlobalConfig(resolvedConfig, true); | ||
| if (!dequal(resolvedConfig, returnConfig)) { | ||
| logger.debug( | ||
| { inheritedConfig: resolvedConfig, filteredConfig: returnConfig }, | ||
| 'Removed global config from inherited config presets.', | ||
| ); |
There was a problem hiding this comment.
Inherited config does allow some fields which were previously considered "global", such as onboarding. Please check that we don't log in this case
HonkingGoose
suggested changes
Oct 17, 2024
|
|
||
| 1. Resolves the presets | ||
| 1. Adds the resolved presets to the inherited config | ||
| 1. Merges the presets on top of the global config |
There was a problem hiding this comment.
Suggested change
| 1. Merges the presets on top of the global config | |
| 1. Merge the presets on top of the global config |
| @@ -159,6 +159,19 @@ Inherited config may use all Repository config settings, and any Global config o | |||
|
|
|||
| For information on how the Mend Renovate App supports Inherited config, see the dedicated "Mend Renovate App Config" section toward the end of this page. | |||
|
|
|||
| #### Presets handling | |||
|
|
|||
| If the inherited config has presets, then Renovate: | |||
There was a problem hiding this comment.
Suggested change
| If the inherited config has presets, then Renovate: | |
| If the inherited config contains `extends` presets, then Renovate will: |
| If the inherited config has presets, then Renovate: | ||
|
|
||
| 1. Resolves the presets | ||
| 1. Adds the resolved presets to the inherited config |
There was a problem hiding this comment.
Suggested change
| 1. Adds the resolved presets to the inherited config | |
| 1. Add the resolved preset config to the beginning of the inherited config |
Maybe this is better. If we go with @rarkins's suggestion, we should keep the the word. 😉
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.
Changes
Resolve presets present in inherited config
Context
Closes: #31278
Documentation (please check one with an [x])
How I've tested my work (please select one)
I have verified these changes via: