Skip to content

Commit d3f6682

Browse files
gentcodyurishkuro
andauthored
Move pkg/config to internal/config (#6884)
## Which problem is this PR solving? - Part of #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]>
1 parent a0d2100 commit d3f6682

File tree

84 files changed

+70
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+70
-70
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,11 @@ generate-mocks: $(MOCKERY)
222222

223223
.PHONY: certs
224224
certs:
225-
cd pkg/config/tlscfg/testdata && ./gen-certs.sh
225+
cd internal/config/tlscfg/testdata && ./gen-certs.sh
226226

227227
.PHONY: certs-dryrun
228228
certs-dryrun:
229-
cd pkg/config/tlscfg/testdata && ./gen-certs.sh -d
229+
cd internal/config/tlscfg/testdata && ./gen-certs.sh -d
230230

231231
.PHONY: repro-check
232232
repro-check:

cmd/all-in-one/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ import (
2929
queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
3030
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
3131
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
32+
"github.com/jaegertracing/jaeger/internal/config"
3233
ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
3334
"github.com/jaegertracing/jaeger/internal/storage/metricstore"
3435
storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
3536
"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
3637
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
3738
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
3839
"github.com/jaegertracing/jaeger/internal/tenancy"
39-
"github.com/jaegertracing/jaeger/pkg/config"
4040
"github.com/jaegertracing/jaeger/pkg/jtracer"
4141
"github.com/jaegertracing/jaeger/pkg/metrics"
4242
"github.com/jaegertracing/jaeger/pkg/telemetry"

cmd/collector/app/flags/flags.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"go.uber.org/zap"
1616

1717
"github.com/jaegertracing/jaeger/cmd/internal/flags"
18+
"github.com/jaegertracing/jaeger/internal/config/corscfg"
19+
"github.com/jaegertracing/jaeger/internal/config/tlscfg"
1820
"github.com/jaegertracing/jaeger/internal/tenancy"
19-
"github.com/jaegertracing/jaeger/pkg/config/corscfg"
20-
"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
2121
"github.com/jaegertracing/jaeger/ports"
2222
)
2323

cmd/collector/app/flags/flags_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/stretchr/testify/require"
1212
"go.uber.org/zap"
1313

14+
"github.com/jaegertracing/jaeger/internal/config"
1415
"github.com/jaegertracing/jaeger/internal/testutils"
15-
"github.com/jaegertracing/jaeger/pkg/config"
1616
)
1717

1818
func TestCollectorOptionsWithFlags_CheckHostPort(t *testing.T) {

cmd/collector/app/handler/zipkin_receiver_tls_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
)
2323

2424
func TestSpanCollectorZipkinTLS(t *testing.T) {
25-
const testCertKeyLocation = "../../../../pkg/config/tlscfg/testdata"
25+
const testCertKeyLocation = "../../../../internal/config/tlscfg/testdata"
2626
testCases := []struct {
2727
name string
2828
serverTLS configtls.ServerConfig

cmd/collector/app/server/http_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/jaegertracing/jaeger/ports"
2727
)
2828

29-
var testCertKeyLocation = "../../../../pkg/config/tlscfg/testdata"
29+
var testCertKeyLocation = "../../../../internal/config/tlscfg/testdata"
3030

3131
// test wrong port number
3232
func TestFailToListenHTTP(t *testing.T) {

cmd/collector/app/span_handler_builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313

1414
"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
1515
cmdFlags "github.com/jaegertracing/jaeger/cmd/internal/flags"
16+
"github.com/jaegertracing/jaeger/internal/config"
1617
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1718
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
1819
"github.com/jaegertracing/jaeger/internal/tenancy"
19-
"github.com/jaegertracing/jaeger/pkg/config"
2020
"github.com/jaegertracing/jaeger/pkg/metrics"
2121
)
2222

cmd/collector/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
cmdFlags "github.com/jaegertracing/jaeger/cmd/internal/flags"
2424
"github.com/jaegertracing/jaeger/cmd/internal/printconfig"
2525
"github.com/jaegertracing/jaeger/cmd/internal/status"
26+
"github.com/jaegertracing/jaeger/internal/config"
2627
ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
2728
storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
2829
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
2930
"github.com/jaegertracing/jaeger/internal/tenancy"
30-
"github.com/jaegertracing/jaeger/pkg/config"
3131
"github.com/jaegertracing/jaeger/pkg/metrics"
3232
"github.com/jaegertracing/jaeger/pkg/telemetry"
3333
"github.com/jaegertracing/jaeger/pkg/version"

cmd/es-index-cleaner/app/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"go.opentelemetry.io/collector/config/configtls"
1111
"go.opentelemetry.io/collector/featuregate"
1212

13-
"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
13+
"github.com/jaegertracing/jaeger/internal/config/tlscfg"
1414
)
1515

1616
const (

cmd/es-index-cleaner/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"go.uber.org/zap"
2121

2222
"github.com/jaegertracing/jaeger/cmd/es-index-cleaner/app"
23-
"github.com/jaegertracing/jaeger/pkg/config"
23+
"github.com/jaegertracing/jaeger/internal/config"
2424
"github.com/jaegertracing/jaeger/pkg/es/client"
2525
)
2626

0 commit comments

Comments
 (0)