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

Change config load order so custom.toml is last #1684

Merged
merged 11 commits into from
Sep 15, 2023

Conversation

Taztingo
Copy link
Contributor

Description

This updates the configuration load order so that custom.toml is the last. This allows any custom changes to overwrite anything that comes packed or unpacked config.

closes: #1262


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer
  • Review Codecov Report in the comment section below once CI passes

@codecov
Copy link

codecov bot commented Sep 13, 2023

Codecov Report

Merging #1684 (6ff0f77) into main (4279889) will increase coverage by 0.03%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1684      +/-   ##
==========================================
+ Coverage   64.77%   64.80%   +0.03%     
==========================================
  Files         261      261              
  Lines       31306    31308       +2     
==========================================
+ Hits        20279    20290      +11     
+ Misses       9746     9740       -6     
+ Partials     1281     1278       -3     
Files Changed Coverage Δ
cmd/provenanced/config/manager.go 60.13% <100.00%> (+2.26%) ⬆️

@Taztingo Taztingo marked this pull request as ready for review September 13, 2023 18:21
@Taztingo Taztingo requested a review from a team as a code owner September 13, 2023 18:21
@Taztingo Taztingo enabled auto-merge (squash) September 13, 2023 18:55
Copy link
Contributor

@SpicyLemon SpicyLemon left a comment

Choose a reason for hiding this comment

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

Should have a changelog entry, then LGTM.

@Taztingo Taztingo self-assigned this Sep 15, 2023
@Taztingo Taztingo requested a review from SpicyLemon September 15, 2023 17:57
Copy link
Contributor

@nullpointer0x00 nullpointer0x00 left a comment

Choose a reason for hiding this comment

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

Nice work!

@Taztingo Taztingo merged commit 4fa90d8 into main Sep 15, 2023
40 checks passed
@Taztingo Taztingo deleted the taztingo/1262-custom-toml-order branch September 15, 2023 21:33
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.

Change load position of custom.toml to be last
4 participants