Compare commits

..

2 Commits

Author SHA1 Message Date
596046fc50 fix versoin newline 2026-07-07 23:48:20 +02:00
002a390f43 satisfy full linter 2026-07-07 23:45:14 +02:00
4 changed files with 2 additions and 29 deletions

View File

@@ -16,7 +16,6 @@ builds:
goos: goos:
- linux - linux
- darwin - darwin
tool: "go1.26.4"
changelog: changelog:
sort: asc sort: asc

2
go.mod
View File

@@ -14,7 +14,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
module codeberg.org/scip/esctl module codeberg.org/scip/esctl
go 1.26 go 1.26.4
require ( require (
github.com/MichaelMure/go-term-markdown v0.1.4 github.com/MichaelMure/go-term-markdown v0.1.4

View File

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

View File

@@ -53,11 +53,6 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
contentline = buf.String() 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, slog.Info("req", "host", req.URL.Host, "uri", req.URL.Path,
"body", content, "bodyline", contentline, "body", content, "bodyline", contentline,
"headers", req.Header, "headers", req.Header,
@@ -65,21 +60,3 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
return t.Transport.RoundTrip(req) 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)
}