Skip to content

Commit 6eaa518

Browse files
committed
config: drop streaming defaults consolidated into max_message_bytes
Removes _defaultMaxNumTargets/_defaultMaxNumChangedTargets/_defaultMaxNumMetadataEntries and their Parse defaulting blocks — they no longer match config/README.md (which documents a single max_message_bytes) and are about to be deleted outright by the follow-up PR that lands the consolidation, so there's no reason to introduce them here first. Also answers a review question on why _bzlmodEnabledDefault sits outside the const block: it has to be a var so its address can be taken.
1 parent d672188 commit 6eaa518

2 files changed

Lines changed: 8 additions & 51 deletions

File tree

config/config.go

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,9 @@ import (
2222
yaml "github.com/goccy/go-yaml"
2323
)
2424

25-
const (
26-
_defaultBazelQueryTimeoutSeconds = 600
27-
_defaultMaxNumTargets = 250
28-
_defaultMaxNumChangedTargets = 125
29-
_defaultMaxNumMetadataEntries = 50_000
30-
)
25+
const _defaultBazelQueryTimeoutSeconds = 600
3126

32-
var (
33-
_bzlmodEnabledDefault = true
34-
)
27+
var _bzlmodEnabledDefault = true
3528

3629
var _ RepositoryConfigProvider = (*Config)(nil)
3730

@@ -78,15 +71,6 @@ func Parse(configFilePath string) (*Config, error) {
7871
if config.Service.MaxWorkerPoolSize <= 0 {
7972
return nil, fmt.Errorf("service.max_worker_pool_size must be > 0, got %d", config.Service.MaxWorkerPoolSize)
8073
}
81-
if config.Service.Streaming.MaxNumTargets <= 0 {
82-
config.Service.Streaming.MaxNumTargets = _defaultMaxNumTargets
83-
}
84-
if config.Service.Streaming.MaxNumChangedTargets <= 0 {
85-
config.Service.Streaming.MaxNumChangedTargets = _defaultMaxNumChangedTargets
86-
}
87-
if config.Service.Streaming.MaxNumMetadataEntries <= 0 {
88-
config.Service.Streaming.MaxNumMetadataEntries = _defaultMaxNumMetadataEntries
89-
}
9074
config.repositoryByRemote = make(map[string]*RepositoryConfig, len(config.Repository))
9175
for i := range config.Repository {
9276
remote := config.Repository[i].Remote

config/config_test.go

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,17 @@ repository:
7272

7373
func TestParse_ServiceDefaults(t *testing.T) {
7474
tests := []struct {
75-
name string
76-
give string
77-
wantWorkerRootPath string
78-
wantMaxNumTargets int
79-
wantMaxNumChangedTargets int
80-
wantMaxNumMetadataEntries int
75+
name string
76+
give string
77+
wantWorkerRootPath string
8178
}{
8279
{
83-
name: "worker_root_path and streaming default when unset",
80+
name: "worker_root_path defaults when unset",
8481
give: _baseServiceYAML + `
8582
repository:
8683
- remote: "r1"
8784
`,
88-
wantWorkerRootPath: filepath.Join("/tmp/x", ".workers"),
89-
wantMaxNumTargets: _defaultMaxNumTargets,
90-
wantMaxNumChangedTargets: _defaultMaxNumChangedTargets,
91-
wantMaxNumMetadataEntries: _defaultMaxNumMetadataEntries,
85+
wantWorkerRootPath: filepath.Join("/tmp/x", ".workers"),
9286
},
9387
{
9488
name: "worker_root_path explicit value preserved",
@@ -100,25 +94,7 @@ service:
10094
repository:
10195
- remote: "r1"
10296
`,
103-
wantWorkerRootPath: "/tmp/custom-workers",
104-
wantMaxNumTargets: _defaultMaxNumTargets,
105-
wantMaxNumChangedTargets: _defaultMaxNumChangedTargets,
106-
wantMaxNumMetadataEntries: _defaultMaxNumMetadataEntries,
107-
},
108-
{
109-
name: "streaming explicit values preserved",
110-
give: _baseServiceYAML + `
111-
streaming:
112-
max_num_targets: 10
113-
max_num_changed_targets: 20
114-
max_num_metadata_entries: 30
115-
repository:
116-
- remote: "r1"
117-
`,
118-
wantWorkerRootPath: filepath.Join("/tmp/x", ".workers"),
119-
wantMaxNumTargets: 10,
120-
wantMaxNumChangedTargets: 20,
121-
wantMaxNumMetadataEntries: 30,
97+
wantWorkerRootPath: "/tmp/custom-workers",
12298
},
12399
}
124100

@@ -127,9 +103,6 @@ repository:
127103
cfg, err := Parse(writeConfig(t, tt.give))
128104
require.NoError(t, err)
129105
assert.Equal(t, tt.wantWorkerRootPath, cfg.Service.WorkerRootPath)
130-
assert.Equal(t, tt.wantMaxNumTargets, cfg.Service.Streaming.MaxNumTargets)
131-
assert.Equal(t, tt.wantMaxNumChangedTargets, cfg.Service.Streaming.MaxNumChangedTargets)
132-
assert.Equal(t, tt.wantMaxNumMetadataEntries, cfg.Service.Streaming.MaxNumMetadataEntries)
133106
})
134107
}
135108
}

0 commit comments

Comments
 (0)