Skip to content

Comments

docker: always merge .yaml.local in conf_get()#2272

Merged
mmetc merged 2 commits intomasterfrom
conf_get_local
Jun 23, 2023
Merged

docker: always merge .yaml.local in conf_get()#2272
mmetc merged 2 commits intomasterfrom
conf_get_local

Conversation

@mmetc
Copy link
Contributor

@mmetc mmetc commented Jun 6, 2023

With this change, all queries to the configuration will return the values from .local if they are set. However, conf_set will only write to .yaml and never to .local. This means users can potentially override values that are supposed to be under control of the entrypoint (credentials and things set from envvars).

See #2121

With this change, all queries to the configuration will return the
values from .local if they are set. However, conf_set will only write
to .yaml and never to .local. This means users can potentially override
values that are supposed to be under control of the entrypoint
(credentials and things set from envvars).
@github-actions
Copy link

github-actions bot commented Jun 6, 2023

@mmetc: There are no 'kind' label on this PR. You need a 'kind' label to generate the release automatically.

  • /kind feature
  • /kind enhancement
  • /kind fix
  • /kind chore
  • /kind dependencies
Details

I am a bot created to help the crowdsecurity developers manage community feedback and contributions. You can check out my manifest file to understand my behavior and what I can do. If you want to use this for your project, you can check out the BirthdayResearch/oss-governance-bot repository.

@github-actions
Copy link

github-actions bot commented Jun 6, 2023

@mmetc: There are no area labels on this PR. You can add as many areas as you see fit.

  • /area agent
  • /area local-api
  • /area cscli
  • /area security
  • /area configuration
Details

I am a bot created to help the crowdsecurity developers manage community feedback and contributions. You can check out my manifest file to understand my behavior and what I can do. If you want to use this for your project, you can check out the BirthdayResearch/oss-governance-bot repository.

@mmetc mmetc marked this pull request as draft June 6, 2023 13:22
@mmetc mmetc added the kind/fix label Jun 6, 2023
@codecov
Copy link

codecov bot commented Jun 6, 2023

Codecov Report

Merging #2272 (f35dd02) into master (76429f0) will increase coverage by 0.36%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2272      +/-   ##
==========================================
+ Coverage   51.24%   51.61%   +0.36%     
==========================================
  Files         106      183      +77     
  Lines       14328    25532   +11204     
==========================================
+ Hits         7343    13178    +5835     
- Misses       6161    10825    +4664     
- Partials      824     1529     +705     
Flag Coverage Δ
bats 37.33% <ø> (?)
unit-windows 51.15% <ø> (-0.10%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 118 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@mmetc mmetc requested a review from LaurenceJJones June 6, 2023 13:40
@mmetc
Copy link
Contributor Author

mmetc commented Jun 8, 2023

@LaurenceJJones can I have some feedback if this solves your use cases

@mmetc mmetc marked this pull request as ready for review June 9, 2023 08:58
@mmetc mmetc added this to the 1.5.3 milestone Jun 14, 2023
Copy link
Contributor

@buixor buixor left a comment

Choose a reason for hiding this comment

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

code-wise ok, let's wait for @LaurenceJJones feedback :)

Copy link
Member

@LaurenceJJones LaurenceJJones left a comment

Choose a reason for hiding this comment

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

LGTM

@mmetc mmetc merged commit 4137482 into master Jun 23, 2023
@mmetc mmetc deleted the conf_get_local branch June 23, 2023 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants