fix(config): Add missing handling for envCache in getKeys()
#46140
+20
−5
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
NC_ env variable overrides were not appearing in the output of `occ config:list system` nor `occ config:system:get xxx`. This was creating nearly impossible to diagnose configuration/ behavior disprepancies. - Refactored readData() so that we aren't saving the entire environment in the envCache anymore (only those prefixed "NC_") and so that we save NC_ provided config values under their real key. - Refactored getValue() to accommodate readData() refactor - Fixed getKeys() to properly return envCache keys too Environment provided config variables now appear in `occ config:list system` as expected. Environment provided config variables now appear when queried via `occ config:system:get KEY` envCache is now free of non-NC stuff. Signed-off-by: Josh Richards <[email protected]>
joshtrichards
added
bug
3. to review
joshtrichards
requested review from
nickvergessen,
icewind1991,
Altahrim,
kesselb and
come-nc
Signed-off-by: Josh Richards <[email protected]>
|
/backport to stable29 |
|
/backport to stable28 |
|
Cypress test seems unrelated (but not the usual "just re-run it" Cypress test failure either). |
joshtrichards
force-pushed
the
fix-nc-env-inclusion
branch
from
2102001
to
6ff093d
Compare
come-nc
reviewed
Jun 27, 2024
joshtrichards
force-pushed
the
fix-nc-env-inclusion
branch
from
6ff093d
to
67b5876
Compare
Signed-off-by: Josh Richards <[email protected]>
joshtrichards
force-pushed
the
fix-nc-env-inclusion
branch
from
91a5264
to
da697ea
Compare
come-nc
approved these changes
Jul 1, 2024
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.
Context: #3966
config.phpvariables (viaNC_*are not reflected inocc config:system:getcommand #36126Summary
NC_environment variableconfig.phpoverrides were not appearing in the output ofocc config:list systemnorocc config:system:get xxx. This was creating nearly impossible to diagnose configuration/ behavior discrepancies.getValue()was already, of course, returningNC_provided config values. ButgetKeys()was not due to (a) it having no handling for theenvCache; (b) all values inenvCachebeing saved underNC_keys rather than their actual config keys (which needed additional handling to be merged with the non-NC_keys).readData()so that:envCacheanymore (only those prefixedNC_)NC_provided config values in theenvCacheunder their real configuration keygetValue()to accommodatereadData()refactorgetKeys()to now returnenvCachekeys as well in order to be consistent withgetValue()(in turn, addressing the underlying bugs noted in the opening paragraph)Result:
occ config:list systemas expected.occ config:system:get blahenvCacheis now free of non-NC related environment variablesTODO
Checklist