Move pkg/config to internal/config #6884
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Oyefule <[email protected]>
Signed-off-by: Oyefule <[email protected]>
|
please fix conflicts |
Signed-off-by: Oyefule <[email protected]>
|
@yurishkuro done |
|
I'm still seeing conflicts (could be from other changes being merged) |
Signed-off-by: Oyefule <[email protected]>
Probably due to other merged PRs. I have resolved the conflicts now |
Signed-off-by: Yuri Shkuro <[email protected]>
yurishkuro
requested changes
Mar 21, 2025
There was a problem hiding this comment.
since you moved certificate files you need to update the references to them
$ rg pkg/config/tlscfg/testdata
Makefile
225: cd pkg/config/tlscfg/testdata && ./gen-certs.sh
229: cd pkg/config/tlscfg/testdata && ./gen-certs.sh -d
cmd/remote-storage/app/server_test.go
37:var testCertKeyLocation = "../../../pkg/config/tlscfg/testdata"
cmd/collector/app/server/http_test.go
29:var testCertKeyLocation = "../../../../pkg/config/tlscfg/testdata"
cmd/collector/app/handler/zipkin_receiver_tls_test.go
25: const testCertKeyLocation = "../../../../pkg/config/tlscfg/testdata"
cmd/query/app/server_test.go
49:var testCertKeyLocation = "../../../pkg/config/tlscfg/testdata"
cmd/internal/flags/admin_test.go
29:var testCertKeyLocation = "../../../pkg/config/tlscfg/testdata"
make sure to run make test and make lint before submitting, you could've easily discovered these issues locally
yurishkuro
added
the
changelog:refactoring
yurishkuro
changed the title
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6884 +/- ##
==========================================
- Coverage 96.15% 96.14% -0.02%
==========================================
Files 341 341
Lines 19738 19738
==========================================
- Hits 18980 18978 -2
- Misses 573 575 +2
Partials 185 185
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Signed-off-by: Oyefule <[email protected]>
…jaeger into move-config-to-internal
Signed-off-by: Oyefule <[email protected]>
|
Signed-off-by: Oyefule <[email protected]>
auto-merge was automatically disabled
March 22, 2025 02:02
Head branch was pushed to by a user without write access
|
@yurishkuro I had issues testing the entire package, and the failing test referenced the path differently but I ran the test in isolation now and it passed, so no issues.
|
yurishkuro
approved these changes
Mar 22, 2025
amilbcahat
pushed a commit
to amilbcahat/jaeger
that referenced
this pull request
May 4, 2025
## Which problem is this PR solving? - Part of jaegertracing#6869 ## Description of the changes - It moves private code from `pkg/config` to `internal/config` - Modifies related files where there are related imports of the moved file(s) ## How was this change tested? ```bash make test ``` ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` --------- Signed-off-by: Oyefule <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
amilbcahat
pushed a commit
to amilbcahat/jaeger
that referenced
this pull request
May 4, 2025
## Which problem is this PR solving? - Part of jaegertracing#6869 ## Description of the changes - It moves private code from `pkg/config` to `internal/config` - Modifies related files where there are related imports of the moved file(s) ## How was this change tested? ```bash make test ``` ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` --------- Signed-off-by: Oyefule <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> Signed-off-by: amol-verma-allen <[email protected]>
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.
Which problem is this PR solving?
Description of the changes
pkg/configtointernal/configHow was this change tested?
make testChecklist
jaeger:make lint test