Skip to content

fix(buildkite): improve error handling for HTTP requests and add fallback for 404 responses #1040

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −8
Open

fix(buildkite): improve error handling for HTTP requests and add fallback for 404 responses #1040

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
38 changes: 30 additions & 8 deletions internal/build/cmd/tools/commands/spec/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/elastic/go-elasticsearch/v9/internal/build/cmd"
"github.com/elastic/go-elasticsearch/v9/internal/build/utils"
"github.com/elastic/go-elasticsearch/v9/internal/version"
"github.com/spf13/cobra"
"io/ioutil"
"log"
"net/http"
Expand All @@ -34,6 +30,11 @@ import (
"path/filepath"
"strings"
"time"

"github.com/elastic/go-elasticsearch/v9/internal/build/cmd"
"github.com/elastic/go-elasticsearch/v9/internal/build/utils"
"github.com/elastic/go-elasticsearch/v9/internal/version"
"github.com/spf13/cobra"
)

var (
Expand Down Expand Up @@ -91,15 +92,36 @@ func (c Command) Execute() (err error) {

res, err := http.Get(versionUrl)
if err != nil {
log.Fatalf(err.Error())
log.Fatal(err.Error())
}
defer res.Body.Close()

if res.StatusCode == http.StatusNotFound {
// Try with version without -SNAPSHOT (e.g., "9.1.0-SNAPSHOT" -> "9.1.0")
fallbackVersion := esBuildVersion
if strings.HasSuffix(esBuildVersion, "-SNAPSHOT") {
fallbackVersion = strings.TrimSuffix(fallbackVersion, "-SNAPSHOT")
} else {
log.Fatalf("Version not found: %s returned 404", esBuildVersion)
}

fallbackUrl := strings.Join([]string{artifactsUrl, fallbackVersion}, "/")
res, err = http.Get(fallbackUrl)
if err != nil {
log.Fatal(err.Error())
}
defer res.Body.Close()

if res.StatusCode == http.StatusNotFound {
log.Fatalf("Version not found: both %s and %s returned 404", esBuildVersion, fallbackVersion)
}
}

var v Versions
dec := json.NewDecoder(res.Body)
err = dec.Decode(&v)
if err != nil {
log.Fatalf(err.Error())
log.Fatal(err.Error())
}

if c.Debug {
Expand All @@ -124,14 +146,14 @@ func (c Command) Execute() (err error) {
}

if err := c.extractZipToDest(data); err != nil {
log.Fatalf(err.Error())
log.Fatal(err.Error())
}

d, _ := json.Marshal(build)

err = c.writeFileToDest("elasticsearch.json", d)
if err != nil {
log.Fatalf(err.Error())
log.Fatal(err.Error())
}

return nil
Expand Down