Compare commits

..

2 Commits

Author SHA1 Message Date
a5933e226b test release 2026-07-08 08:58:15 +02:00
5a74b2f72b no patch level 2026-07-08 08:47:28 +02:00
3 changed files with 3 additions and 29 deletions

View File

@@ -6,8 +6,8 @@ labels:
steps:
goreleaser:
image: goreleaser/goreleaser
when:
event: [tag,manual]
# when:
# event: [tag,manual]
environment:
GITEA_TOKEN:
from_secret: DEPLOY_TOKEN

View File

@@ -189,7 +189,6 @@ func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
cluster.getTransport(),
elastictransport.WithHeader(headers),
),
elasticsearch.WithCompatibilityMode(),
}
}
@@ -204,9 +203,7 @@ func (cluster *Cluster) getTransport() elastictransport.Option {
)
}
return elastictransport.WithTransport(
&CompatibilityTransport{Transport: transport},
)
return elastictransport.WithTransport(transport)
}
func (conf *Config) SetupES() error {

View File

@@ -53,11 +53,6 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
contentline = buf.String()
}
if req.Header.Get("Accept") != "" {
req.Header.Del("Accept")
req.Header.Add("Accept", "application/json")
}
slog.Info("req", "host", req.URL.Host, "uri", req.URL.Path,
"body", content, "bodyline", contentline,
"headers", req.Header,
@@ -65,21 +60,3 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
return t.Transport.RoundTrip(req)
}
// Fixes https://codeberg.org/scip/esctl/issues/79:
// the API client has this Accept header hardcoded everywhere:
// req.Header.Set("Accept", "application/vnd.elasticsearch+json;compatible-with=9")
// While this works pretty well with ES9, it doesn't with ES8. So, we replace
// this header with a new one without the compatibility part.
type CompatibilityTransport struct {
Transport http.RoundTripper
}
func (t *CompatibilityTransport) RoundTrip(req *http.Request) (*http.Response, error) {
if req.Header.Get("Accept") != "" {
req.Header.Del("Accept")
req.Header.Add("Accept", "application/json")
}
return t.Transport.RoundTrip(req)
}