Skip to content

Remove unused transport switches #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
behinddwalls wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove unused transport switches #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions crates/walgit-config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ pub struct Config {
#[serde(deny_unknown_fields, default)]
pub struct ServerConfig {
pub listen: SocketAddr,
pub http2: bool,
pub max_concurrent_requests: usize,
/// Per-repo cap on concurrent upload-pack/receive-pack processes.
pub max_concurrent_per_repo: usize,
Expand Down Expand Up @@ -256,7 +255,6 @@ pub enum StoreBackend {
pub struct GcsConfig {
/// gRPC endpoint.
pub endpoint: String,
pub direct_connectivity: bool,
/// Service account for signed URLs; None = ADC/IAM signBlob.
pub signing_service_account: Option<String>,
/// Separate data clients (own channels) for bulk traffic — pack/idx/side-
Expand Down Expand Up @@ -796,7 +794,6 @@ impl Default for ServerConfig {
fn default() -> Self {
ServerConfig {
listen: std::net::SocketAddr::from(([127, 0, 0, 1], 8080)),
http2: true,
max_concurrent_requests: 512,
max_concurrent_per_repo: 64,
request_timeout: Duration::from_hours(1),
Expand Down Expand Up @@ -852,7 +849,6 @@ impl Default for GcsConfig {
fn default() -> Self {
GcsConfig {
endpoint: "https://storage.googleapis.com".into(),
direct_connectivity: true,
signing_service_account: None,
bulk_clients: 4,
bulk_concurrency: 32,
Expand Down Expand Up @@ -1549,6 +1545,16 @@ mod tests {
);
}

#[test]
fn removed_transport_switches_are_rejected() {
for input in [
"[server]\nhttp2 = false\n",
"[store.gcs]\ndirect_connectivity = false\n",
] {
assert!(Config::parse(input).is_err(), "{input}");
}
}

#[test]
fn settings_merge_over_config_and_are_restricted() {
let mut base = Config::default();
Expand Down
2 changes: 0 additions & 2 deletions walgit.example.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

[server]
listen = "127.0.0.1:8080" # default; `mode = none` is refused unless this is loopback. Public bind: 0.0.0.0 with token/oidc.
http2 = true # HTTP/2 (h2c when TLS is off, ALPN when on)
max_concurrent_requests = 512 # global cap on in-flight git requests
max_concurrent_per_repo = 64 # per-repo cap (upload-pack / receive-pack)
request_timeout = "1h"
Expand Down Expand Up @@ -80,7 +79,6 @@ force_path_style = false # true for most self-hosted S3 implementations

[store.gcs]
endpoint = "https://storage.googleapis.com" # gRPC endpoint; credentials = Application Default Credentials
direct_connectivity = true
# signing_service_account = "sa@project.iam.gserviceaccount.com" # for lfs serve_via = "signed_url"
bulk_clients = 4 # separate data channels for pack/idx/side-file/LFS bytes + ranged reads
bulk_concurrency = 32 # max concurrent bulk requests per process (control plane never queues behind them)
Expand Down