upgrade go version to 1.21

Author: shinexia

.dockerignore

@@ -1,7 +1,7 @@
-Dockerfile
 .git
 .idea
 .vscode
+/docker
 /elasticdump
 /elasticdump-linux-amd64
 /elasticdumptest-*

Makefile

@@ -1,7 +1,7 @@
 .PHONY: all elasticdump docker-build img clean
 
 DOCKER         ?= docker
-GOLANG_VERSION ?= 1.18-alpine
+GOLANG_VERSION ?= 1.21-alpine
 IMAGE          ?= elasticdump
 VERSION        ?= latest
 GOOS           ?= linux
@@ -16,8 +16,8 @@ elasticdump:
 
 docker-build:
 	$(DOCKER) run --rm --name elasticdump-build -it \
-		-v $(shell pwd):/go/src/xgh.io/elasticdump \
-		--workdir /go/src/xgh.io/elasticdump \
+		-v $(shell pwd):/build \
+		--workdir /build \
 		--user $(shell id -u):$(shell id -g) \
 		--env XDG_CACHE_HOME=/tmp/.cache \
 		--env GOOS=$(GOOS) \

README.md

@@ -8,7 +8,7 @@ The ElasicSearch did not offer a dump tool, and the only tool provided at <https
 
 ## INSTALL
 
-1. `go install xgh.io/elasticdump`
+1. `go install github.com/shinexia/elasticdump`
 
 2. or download a prebuilt binary here: <https://github.com/shinexia/elasticdump/releases/>
 

cmd/cmd.go

@@ -25,7 +25,7 @@ func NewElasticDumpCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 			    │ a simple dump/load data/mapping from elasticsearch       │
 			    │                                                          │
 			    │ Please give us feedback at:                              │
-			    │ https://xgh.io/elasticdump/issues           │
+			    │ https://github.com/shinexia/elasticdump/issues           │
 			    └──────────────────────────────────────────────────────────┘
 
 			Example usage:

cmd/delete_index.go

@@ -11,11 +11,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/shinexia/elasticdump/pkg/helpers"
+
 	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"xgh.io/elasticdump/pkg/helpers"
 )
 
 func newCmdDeleteIndex(out io.Writer) *cobra.Command {

cmd/dump_data.go

@@ -12,11 +12,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/shinexia/elasticdump/pkg/dumpdata"
+	"github.com/shinexia/elasticdump/pkg/helpers"
+
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"xgh.io/elasticdump/pkg/dumpdata"
-	"xgh.io/elasticdump/pkg/helpers"
 )
 
 func newCmdDumpData(out io.Writer) *cobra.Command {

cmd/dump_mapping.go

@@ -8,15 +8,15 @@ package cmd
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"time"
 
+	"github.com/shinexia/elasticdump/pkg/helpers"
+
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"xgh.io/elasticdump/pkg/helpers"
 )
 
 func newCmdDumpMapping(out io.Writer) *cobra.Command {
@@ -52,7 +52,7 @@ func newCmdDumpMapping(out io.Writer) *cobra.Command {
 			if err != nil {
 				return errors.Cause(err)
 			}
-			body, err := ioutil.ReadAll(res.Body)
+			body, err := io.ReadAll(res.Body)
 			if res.IsError() || err != nil {
 				return errors.Errorf("status: %d, body: %s", res.StatusCode, string(body))
 			}

cmd/gen_test_data.go

@@ -9,10 +9,11 @@ package cmd
 import (
 	"io"
 
+	"github.com/shinexia/elasticdump/pkg/helpers"
+	"github.com/shinexia/elasticdump/pkg/loaddata"
+
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"xgh.io/elasticdump/pkg/helpers"
-	"xgh.io/elasticdump/pkg/loaddata"
 )
 
 func newCmdTestGenData(out io.Writer) *cobra.Command {

cmd/load_data.go

@@ -10,11 +10,12 @@ import (
 	"io"
 	"os"
 
+	"github.com/shinexia/elasticdump/pkg/helpers"
+	"github.com/shinexia/elasticdump/pkg/loaddata"
+
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"xgh.io/elasticdump/pkg/helpers"
-	"xgh.io/elasticdump/pkg/loaddata"
 )
 
 func newCmdLoadData(out io.Writer) *cobra.Command {

cmd/load_mapping.go

@@ -9,14 +9,15 @@ package cmd
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
+	"os"
 	"time"
 
+	"github.com/shinexia/elasticdump/pkg/helpers"
+	"github.com/shinexia/elasticdump/pkg/mapping"
+
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
-	"xgh.io/elasticdump/pkg/helpers"
-	"xgh.io/elasticdump/pkg/mapping"
 )
 
 func newCmdLoadMapping(out io.Writer) *cobra.Command {
@@ -58,7 +59,7 @@ func newCmdLoadMapping(out io.Writer) *cobra.Command {
 			inputFile := extra.InputFile
 			klog.V(5).Infof("reading file: %s\n", inputFile)
 			startTime := time.Now()
-			mappingData, err := ioutil.ReadFile(inputFile)
+			mappingData, err := os.ReadFile(inputFile)
 			if err != nil {
 				return errors.Wrapf(err, "read file: %s failed", inputFile)
 			}

docker/Dockerfile

@@ -2,18 +2,17 @@
 #
 # Licensed under the MIT License.
 
-ARG GOLANG_VERSION=1.18-alpine
+ARG GOLANG_VERSION=1.21-alpine
 FROM golang:$GOLANG_VERSION as build
 
-WORKDIR /build
-COPY . .
+COPY ./ /build
 
 ARG GOPROXY=
 ENV GOPROXY=$GOPROXY
 ENV CGO_ENABLED=0
 
 ARG LDFLAGS="-s -w"
-RUN go build -v -ldflags="$LDFLAGS" -buildvcs=false -o /build/elasticdump
+RUN cd /build && go build -v -ldflags="$LDFLAGS" -buildvcs=false -o /build/elasticdump
 
 FROM alpine:latest
 

go.mod

@@ -1,6 +1,6 @@
-module xgh.io/elasticdump
+module github.com/shinexia/elasticdump
 
-go 1.19
+go 1.21
 
 require (
 	github.com/elastic/go-elasticsearch/v7 v7.17.10

main.go

@@ -10,7 +10,7 @@ import (
 	"log"
 	"os"
 
-	"xgh.io/elasticdump/cmd"
+	"github.com/shinexia/elasticdump/cmd"
 )
 
 func main() {

pkg/dumpdata/dumpdata.go

@@ -11,7 +11,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 
 	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
@@ -36,12 +36,15 @@ func NewDumpDataOption() *DumpDataOption {
 
 func DumpData(client *elasticsearch.Client, dumpOption *DumpDataOption, writeFunc WriteDataFunc, o ...func(*esapi.SearchRequest)) (int, error) {
 	res, err := client.Search(o...)
+	if err != nil {
+		return 0, errors.Cause(err)
+	}
 	count := 0
 	for {
+		body, err := io.ReadAll(res.Body)
 		if err != nil {
 			return count, errors.Cause(err)
 		}
-		body, err := ioutil.ReadAll(res.Body)
 		if res.IsError() {
 			return count, errors.New(res.String())
 		}
@@ -68,6 +71,9 @@ func DumpData(client *elasticsearch.Client, dumpOption *DumpDataOption, writeFun
 		}
 		scrollReq := []byte(fmt.Sprintf(`{"scroll": "%ds","scroll_id": "%s"}`, dumpOption.TimeoutSec, response.ScrollID))
 		res, err = client.Scroll(client.Scroll.WithContext(context.Background()), client.Scroll.WithBody(bytes.NewReader(scrollReq)))
+		if err != nil {
+			return count, errors.Cause(err)
+		}
 	}
 	return count, nil
 }

pkg/helpers/ioutil.go pkg/helpers/jsonutil.go

@@ -12,7 +12,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"strconv"
 	"time"
 
@@ -109,7 +108,7 @@ func LoadData(client *elasticsearch.Client, queue *DataQueue[*Hit], batch int, i
 		if err != nil {
 			return errors.WithStack(err)
 		}
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		if res.IsError() || err != nil {
 			return errors.Errorf("status: %d, body: %s", res.StatusCode, string(body))
 		}