Skip to content
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

fix(agent): fix errors when endpoint config ends with trailing slash. #3281

Merged
merged 3 commits into from
Oct 17, 2024
Merged

fix(agent): fix errors when endpoint config ends with trailing slash. #3281

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36593ba
fix(agent): fix errors when endpoint config ends with trailing slash.
icycodes Oct 17, 2024
d97683d
[autofix.ci] apply automated fixes
autofix-ci[bot] Oct 17, 2024
52dd852
fix(agent): remove possible multiple trailing slashes from the endpoi…
icycodes Oct 17, 2024
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
6 changes: 6 additions & 0 deletions clients/tabby-agent/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ function mergeConfig(
serverProvidedConfig.anonymousUsageTracking = { disable: true };
}
const merged = mergeFunction(base, configFileConfig, clientProvidedConfig, serverProvidedConfig) as ConfigData;

// remove trailing slash from endpoint
if (merged.server.endpoint) {
merged.server.endpoint = merged.server.endpoint.replace(/\/+$/, "");
}

return merged;
}

Expand Down
Loading