Skip to content

Commit b031307

Browse files
longquanzhenglongquanzheng
authored
Refactor config: move config and dynamiconfig one level up (cadence-workflow#4118)
1 parent 429cb11 commit b031307

File tree

192 files changed

+189
-189
lines changed

Some content is hidden

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

192 files changed

+189
-189
lines changed

‎bench/lib/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package lib
2323
import (
2424
"errors"
2525

26-
"github.com/uber/cadence/common/service/config"
26+
"github.com/uber/cadence/common/config"
2727
)
2828

2929
const (

‎canary/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"go.uber.org/cadence/.gen/go/cadence/workflowserviceclient"
2828
"go.uber.org/zap"
2929

30-
"github.com/uber/cadence/common/service/config"
30+
"github.com/uber/cadence/common/config"
3131
)
3232

3333
const (

‎client/clientfactory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import (
3434
"github.com/uber/cadence/client/history"
3535
"github.com/uber/cadence/client/matching"
3636
"github.com/uber/cadence/common"
37+
"github.com/uber/cadence/common/dynamicconfig"
3738
"github.com/uber/cadence/common/log"
3839
"github.com/uber/cadence/common/membership"
3940
"github.com/uber/cadence/common/metrics"
40-
"github.com/uber/cadence/common/service/dynamicconfig"
4141
)
4242

4343
const (

‎client/matching/loadbalancer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"strings"
2727

2828
"github.com/uber/cadence/common"
29-
"github.com/uber/cadence/common/service/dynamicconfig"
29+
"github.com/uber/cadence/common/dynamicconfig"
3030
"github.com/uber/cadence/common/types"
3131
)
3232

‎cmd/bench/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
"github.com/uber/cadence/bench"
3232
"github.com/uber/cadence/bench/lib"
33-
"github.com/uber/cadence/common/service/config"
33+
"github.com/uber/cadence/common/config"
3434
)
3535

3636
const (

‎cmd/canary/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/urfave/cli"
3030

3131
"github.com/uber/cadence/canary"
32-
"github.com/uber/cadence/common/service/config"
32+
"github.com/uber/cadence/common/config"
3333
)
3434

3535
func startHandler(c *cli.Context) {

‎cmd/server/cadence/cadence.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/urfave/cli"
3232

3333
"github.com/uber/cadence/common"
34-
"github.com/uber/cadence/common/service/config"
34+
"github.com/uber/cadence/common/config"
3535
"github.com/uber/cadence/tools/cassandra"
3636
"github.com/uber/cadence/tools/sql"
3737
)

‎cmd/server/cadence/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ import (
3333
"github.com/uber/cadence/common/authorization"
3434
"github.com/uber/cadence/common/blobstore/filestore"
3535
"github.com/uber/cadence/common/cluster"
36+
"github.com/uber/cadence/common/config"
37+
"github.com/uber/cadence/common/dynamicconfig"
3638
"github.com/uber/cadence/common/elasticsearch"
3739
"github.com/uber/cadence/common/log/loggerimpl"
3840
"github.com/uber/cadence/common/log/tag"
3941
"github.com/uber/cadence/common/messaging/kafka"
4042
"github.com/uber/cadence/common/metrics"
4143
"github.com/uber/cadence/common/service"
42-
"github.com/uber/cadence/common/service/config"
43-
"github.com/uber/cadence/common/service/dynamicconfig"
4444
"github.com/uber/cadence/service/frontend"
4545
"github.com/uber/cadence/service/history"
4646
"github.com/uber/cadence/service/matching"

‎common/archiver/README.md

+1-1

‎common/archiver/archivalMetadata.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"strings"
2626

2727
"github.com/uber/cadence/common"
28-
"github.com/uber/cadence/common/service/config"
29-
"github.com/uber/cadence/common/service/dynamicconfig"
28+
"github.com/uber/cadence/common/config"
29+
"github.com/uber/cadence/common/dynamicconfig"
3030
"github.com/uber/cadence/common/types"
3131
)
3232

‎common/archiver/filestore/historyArchiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ import (
4444
"github.com/uber/cadence/common"
4545
"github.com/uber/cadence/common/archiver"
4646
"github.com/uber/cadence/common/backoff"
47+
"github.com/uber/cadence/common/config"
4748
"github.com/uber/cadence/common/log/tag"
4849
"github.com/uber/cadence/common/persistence"
49-
"github.com/uber/cadence/common/service/config"
5050
"github.com/uber/cadence/common/types"
5151
"github.com/uber/cadence/common/util"
5252
)

‎common/archiver/filestore/historyArchiver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import (
3636

3737
"github.com/uber/cadence/common"
3838
"github.com/uber/cadence/common/archiver"
39+
"github.com/uber/cadence/common/config"
3940
"github.com/uber/cadence/common/log/loggerimpl"
40-
"github.com/uber/cadence/common/service/config"
4141
"github.com/uber/cadence/common/types"
4242
"github.com/uber/cadence/common/util"
4343
)

‎common/archiver/filestore/visibilityArchiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131

3232
"github.com/uber/cadence/common"
3333
"github.com/uber/cadence/common/archiver"
34+
"github.com/uber/cadence/common/config"
3435
"github.com/uber/cadence/common/log/tag"
35-
"github.com/uber/cadence/common/service/config"
3636
"github.com/uber/cadence/common/types"
3737
"github.com/uber/cadence/common/util"
3838
)

‎common/archiver/filestore/visibilityArchiver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737

3838
"github.com/uber/cadence/common"
3939
"github.com/uber/cadence/common/archiver"
40+
"github.com/uber/cadence/common/config"
4041
"github.com/uber/cadence/common/log/loggerimpl"
41-
"github.com/uber/cadence/common/service/config"
4242
"github.com/uber/cadence/common/types"
4343
"github.com/uber/cadence/common/util"
4444
)

‎common/archiver/gcloud/connector/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"google.golang.org/api/iterator"
3434

3535
"github.com/uber/cadence/common/archiver"
36-
"github.com/uber/cadence/common/service/config"
36+
"github.com/uber/cadence/common/config"
3737
)
3838

3939
const (

‎common/archiver/gcloud/connector/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"github.com/uber/cadence/common/archiver"
4040
"github.com/uber/cadence/common/archiver/gcloud/connector"
4141
"github.com/uber/cadence/common/archiver/gcloud/connector/mocks"
42-
"github.com/uber/cadence/common/service/config"
42+
"github.com/uber/cadence/common/config"
4343
)
4444

4545
func (s *clientSuite) SetupTest() {

‎common/archiver/gcloud/historyArchiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import (
3030
"github.com/uber/cadence/common/archiver"
3131
"github.com/uber/cadence/common/archiver/gcloud/connector"
3232
"github.com/uber/cadence/common/backoff"
33+
"github.com/uber/cadence/common/config"
3334
"github.com/uber/cadence/common/log/tag"
3435
"github.com/uber/cadence/common/metrics"
3536
"github.com/uber/cadence/common/persistence"
36-
"github.com/uber/cadence/common/service/config"
3737
"github.com/uber/cadence/common/types"
3838
)
3939

‎common/archiver/gcloud/visibilityArchiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929

3030
"github.com/uber/cadence/common/archiver"
3131
"github.com/uber/cadence/common/archiver/gcloud/connector"
32+
"github.com/uber/cadence/common/config"
3233
"github.com/uber/cadence/common/log/tag"
3334
"github.com/uber/cadence/common/metrics"
34-
"github.com/uber/cadence/common/service/config"
3535
"github.com/uber/cadence/common/types"
3636
)
3737

‎common/archiver/provider/provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/uber/cadence/common/archiver"
3030
"github.com/uber/cadence/common/archiver/filestore"
3131
"github.com/uber/cadence/common/archiver/s3store"
32-
"github.com/uber/cadence/common/service/config"
32+
"github.com/uber/cadence/common/config"
3333
)
3434

3535
var (

‎common/archiver/s3store/historyArchiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ import (
4040
"github.com/uber/cadence/common"
4141
"github.com/uber/cadence/common/archiver"
4242
"github.com/uber/cadence/common/backoff"
43+
"github.com/uber/cadence/common/config"
4344
"github.com/uber/cadence/common/log/tag"
4445
"github.com/uber/cadence/common/metrics"
4546
"github.com/uber/cadence/common/persistence"
46-
"github.com/uber/cadence/common/service/config"
4747
"github.com/uber/cadence/common/types"
4848
)
4949

‎common/archiver/s3store/visibilityArchiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"github.com/aws/aws-sdk-go/service/s3/s3iface"
3232

3333
"github.com/uber/cadence/common/archiver"
34+
"github.com/uber/cadence/common/config"
3435
"github.com/uber/cadence/common/log/tag"
35-
"github.com/uber/cadence/common/service/config"
3636
"github.com/uber/cadence/common/types"
3737
)
3838

‎common/blobstore/filestore/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"os"
3131

3232
"github.com/uber/cadence/common/blobstore"
33-
"github.com/uber/cadence/common/service/config"
33+
"github.com/uber/cadence/common/config"
3434
"github.com/uber/cadence/common/util"
3535
)
3636

‎common/blobstore/filestore/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/stretchr/testify/suite"
3333

3434
"github.com/uber/cadence/common/blobstore"
35-
"github.com/uber/cadence/common/service/config"
35+
"github.com/uber/cadence/common/config"
3636
"github.com/uber/cadence/common/util"
3737
)
3838

‎common/cache/domainCache_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ import (
3434
"github.com/uber/cadence/common"
3535
"github.com/uber/cadence/common/clock"
3636
"github.com/uber/cadence/common/cluster"
37+
"github.com/uber/cadence/common/dynamicconfig"
3738
"github.com/uber/cadence/common/log"
3839
"github.com/uber/cadence/common/log/loggerimpl"
3940
"github.com/uber/cadence/common/metrics"
4041
"github.com/uber/cadence/common/mocks"
4142
"github.com/uber/cadence/common/persistence"
42-
"github.com/uber/cadence/common/service/dynamicconfig"
4343
"github.com/uber/cadence/common/types"
4444
)
4545

‎common/cluster/metadata.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"fmt"
2727

2828
"github.com/uber/cadence/common"
29+
"github.com/uber/cadence/common/config"
30+
"github.com/uber/cadence/common/dynamicconfig"
2931
"github.com/uber/cadence/common/log"
30-
"github.com/uber/cadence/common/service/config"
31-
"github.com/uber/cadence/common/service/dynamicconfig"
3232
)
3333

3434
type (

‎common/cluster/metadataTest.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ package cluster
2222

2323
import (
2424
"github.com/uber/cadence/common"
25+
"github.com/uber/cadence/common/config"
26+
"github.com/uber/cadence/common/dynamicconfig"
2527
"github.com/uber/cadence/common/log/loggerimpl"
26-
"github.com/uber/cadence/common/service/config"
27-
"github.com/uber/cadence/common/service/dynamicconfig"
2828
)
2929

3030
const (

‎common/cluster/metadata_mock.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/service/config/archival.go ‎common/config/archival.go

File renamed without changes.

‎common/service/config/config.go ‎common/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030

3131
"github.com/uber/cadence/common"
3232
"github.com/uber/cadence/common/auth"
33+
"github.com/uber/cadence/common/dynamicconfig"
3334
"github.com/uber/cadence/common/persistence/nosql/nosqlplugin/cassandra/gocql"
34-
"github.com/uber/cadence/common/service/dynamicconfig"
3535
)
3636

3737
type (

‎common/service/config/config_test.go ‎common/config/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
func TestToString(t *testing.T) {
3232
var cfg Config
33-
err := Load("", "../../../config", "", &cfg)
33+
err := Load("", "../../config", "", &cfg)
3434
assert.NoError(t, err)
3535
assert.NotEmpty(t, cfg.String())
3636
}

‎common/service/config/elasticsearch.go ‎common/config/elasticsearch.go

File renamed without changes.

‎common/service/config/kafkaConfig.go ‎common/config/kafkaConfig.go

File renamed without changes.

‎common/service/config/loader.go ‎common/config/loader.go

File renamed without changes.

‎common/service/config/loader_test.go ‎common/config/loader_test.go

File renamed without changes.

‎common/service/config/localip.go ‎common/config/localip.go

File renamed without changes.

‎common/service/config/localip_test.go ‎common/config/localip_test.go

File renamed without changes.

‎common/service/config/log.go ‎common/config/log.go

File renamed without changes.

‎common/service/config/log_test.go ‎common/config/log_test.go

File renamed without changes.

‎common/service/config/metrics.go ‎common/config/metrics.go

File renamed without changes.

‎common/service/config/metrics_test.go ‎common/config/metrics_test.go

File renamed without changes.

‎common/service/config/persistence.go ‎common/config/persistence.go

File renamed without changes.

‎common/service/config/pprof.go ‎common/config/pprof.go

File renamed without changes.

‎common/service/config/ringpop.go ‎common/config/ringpop.go

File renamed without changes.

‎common/service/config/ringpop_test.go ‎common/config/ringpop_test.go

File renamed without changes.

‎common/service/config/rpc.go ‎common/config/rpc.go

File renamed without changes.

‎common/domain/failover_watcher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
"github.com/uber/cadence/common/backoff"
3232
"github.com/uber/cadence/common/cache"
3333
"github.com/uber/cadence/common/clock"
34+
"github.com/uber/cadence/common/dynamicconfig"
3435
"github.com/uber/cadence/common/log"
3536
"github.com/uber/cadence/common/log/tag"
3637
"github.com/uber/cadence/common/metrics"
3738
"github.com/uber/cadence/common/persistence"
38-
"github.com/uber/cadence/common/service/dynamicconfig"
3939
)
4040

4141
const (

‎common/domain/failover_watcher_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import (
3636
"github.com/uber/cadence/common"
3737
"github.com/uber/cadence/common/cache"
3838
"github.com/uber/cadence/common/clock"
39+
"github.com/uber/cadence/common/dynamicconfig"
3940
"github.com/uber/cadence/common/log/loggerimpl"
4041
"github.com/uber/cadence/common/metrics"
4142
"github.com/uber/cadence/common/mocks"
4243
"github.com/uber/cadence/common/persistence"
43-
"github.com/uber/cadence/common/service/dynamicconfig"
4444
)
4545

4646
type (

‎common/domain/handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import (
3434
"github.com/uber/cadence/common/archiver/provider"
3535
"github.com/uber/cadence/common/clock"
3636
"github.com/uber/cadence/common/cluster"
37+
"github.com/uber/cadence/common/dynamicconfig"
3738
"github.com/uber/cadence/common/log"
3839
"github.com/uber/cadence/common/log/tag"
3940
"github.com/uber/cadence/common/persistence"
40-
"github.com/uber/cadence/common/service/dynamicconfig"
4141
"github.com/uber/cadence/common/types"
4242
)
4343

‎common/domain/handler_GlobalDomainDisabled_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ import (
3535
"github.com/uber/cadence/common/archiver/provider"
3636
"github.com/uber/cadence/common/clock"
3737
"github.com/uber/cadence/common/cluster"
38+
"github.com/uber/cadence/common/config"
39+
dc "github.com/uber/cadence/common/dynamicconfig"
3840
"github.com/uber/cadence/common/log/loggerimpl"
3941
"github.com/uber/cadence/common/mocks"
4042
"github.com/uber/cadence/common/persistence"
4143
persistencetests "github.com/uber/cadence/common/persistence/persistence-tests"
42-
"github.com/uber/cadence/common/service/config"
43-
dc "github.com/uber/cadence/common/service/dynamicconfig"
4444
"github.com/uber/cadence/common/types"
4545
)
4646

‎common/domain/handler_GlobalDomainEnabled_MasterCluster_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ import (
3636
"github.com/uber/cadence/common/archiver/provider"
3737
"github.com/uber/cadence/common/clock"
3838
"github.com/uber/cadence/common/cluster"
39+
"github.com/uber/cadence/common/config"
40+
dc "github.com/uber/cadence/common/dynamicconfig"
3941
"github.com/uber/cadence/common/log/loggerimpl"
4042
"github.com/uber/cadence/common/mocks"
4143
"github.com/uber/cadence/common/persistence"
4244
persistencetests "github.com/uber/cadence/common/persistence/persistence-tests"
43-
"github.com/uber/cadence/common/service/config"
44-
dc "github.com/uber/cadence/common/service/dynamicconfig"
4545
"github.com/uber/cadence/common/types"
4646
)
4747

‎common/domain/handler_GlobalDomainEnabled_NotMasterCluster_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ import (
3636
"github.com/uber/cadence/common/archiver/provider"
3737
"github.com/uber/cadence/common/clock"
3838
"github.com/uber/cadence/common/cluster"
39+
"github.com/uber/cadence/common/config"
40+
dc "github.com/uber/cadence/common/dynamicconfig"
3941
"github.com/uber/cadence/common/log/loggerimpl"
4042
"github.com/uber/cadence/common/mocks"
4143
"github.com/uber/cadence/common/persistence"
4244
persistencetests "github.com/uber/cadence/common/persistence/persistence-tests"
43-
"github.com/uber/cadence/common/service/config"
44-
dc "github.com/uber/cadence/common/service/dynamicconfig"
4545
"github.com/uber/cadence/common/types"
4646
)
4747

‎common/domain/handler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ import (
3737
"github.com/uber/cadence/common/archiver/provider"
3838
"github.com/uber/cadence/common/clock"
3939
"github.com/uber/cadence/common/cluster"
40+
"github.com/uber/cadence/common/config"
41+
dc "github.com/uber/cadence/common/dynamicconfig"
4042
"github.com/uber/cadence/common/log/loggerimpl"
4143
"github.com/uber/cadence/common/mocks"
4244
"github.com/uber/cadence/common/persistence"
4345
persistencetests "github.com/uber/cadence/common/persistence/persistence-tests"
44-
"github.com/uber/cadence/common/service/config"
45-
dc "github.com/uber/cadence/common/service/dynamicconfig"
4646
"github.com/uber/cadence/common/types"
4747
)
4848

0 commit comments

Comments
 (0)