dapr
dapr copied to clipboard
Fix use mTLS settings from config.yaml when flag not defined
Description
Add sentryAddress for mtls config. Use enableMTLS and sentryAddress from config.yaml when not supplying from flags.
Issue reference
Please reference the issue this PR will close: dapr/dapr#4012
Checklist
Please make sure you've completed the relevant tasks for this PR, out of the following list:
- [x] Code compiles correctly
- [x] Created/updated tests
- [x] Unit tests passing
- [ ] End-to-end tests passing
- [ ] Extended the documentation / Created issue in the https://github.com/dapr/docs/ repo: dapr/docs#[issue number]
- [ ] Specification has been updated / Created issue in the https://github.com/dapr/docs/ repo: dapr/docs#[issue number]
- [ ] Provided sample for the feature / Created issue in the https://github.com/dapr/docs/ repo: dapr/docs#[issue number]
Codecov Report
Merging #3951 (6ffe6ab) into master (0aee4d7) will increase coverage by
0.69%. The diff coverage is50.00%.
@@ Coverage Diff @@
## master #3951 +/- ##
==========================================
+ Coverage 64.35% 65.04% +0.69%
==========================================
Files 109 109
Lines 11022 11008 -14
==========================================
+ Hits 7093 7160 +67
+ Misses 3403 3292 -111
- Partials 526 556 +30
| Impacted Files | Coverage Δ | |
|---|---|---|
| pkg/config/configuration.go | 70.00% <ø> (ø) |
|
| pkg/runtime/cli.go | 43.45% <50.00%> (+40.15%) |
:arrow_up: |
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact),ø = not affected,? = missing dataPowered by Codecov. Last update 0aee4d7...6ffe6ab. Read the comment docs.
This pull request has been automatically marked as stale because it has not had activity in the last 60 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!
@Taction Could you please have a look at failing PR check so that we can proceed further. Thanks
@pravinpushkar All checks have passed. Feel free to remind me if there is anything I missed.
This pull request has been automatically marked as stale because it has not had activity in the last 60 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!
This pull request has been automatically marked as stale because it has not had activity in the last 60 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!
This pull request has been automatically closed because it has not had activity in the last 67 days. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!
This pull request has been automatically marked as stale because it has not had activity in the last 60 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!
@Taction please fix conflicts then we can make it land.
I ran into this same issue this week when trying to setup sentry in docker-compose
Since there are several conflicts, which is a bit complicated to solve, moved the code to #6347