Skip to content

fix: get remote file before appending default file names #538

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

Merged
merged 3 commits into from
Jun 25, 2024
Merged

fix: get remote file before appending default file names #538

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de94f28
fix: get remote file before appending default file names
g-linville Jun 24, 2024
94ab8c2
improve
g-linville Jun 24, 2024
95a44a5
fix comment
g-linville Jun 24, 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
14 changes: 14 additions & 0 deletions pkg/loader/url.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,20 @@ func loadURL(ctx context.Context, cache *cache.Client, base *source, name string

func getWithDefaults(req *http.Request) ([]byte, error) {
originalPath := req.URL.Path

// First, try to get the original path as is. It might be an OpenAPI definition.
resp, err := http.DefaultClient.Do(req)
if err != nil {
return nil, err
}
defer resp.Body.Close()

if resp.StatusCode == http.StatusOK {
if toolBytes, err := io.ReadAll(resp.Body); err == nil && isOpenAPI(toolBytes) != 0 {
return toolBytes, nil
}
}

for i, def := range types.DefaultFiles {
base := path.Base(originalPath)
if !strings.Contains(base, ".") {
Expand Down
Loading