Merge pull request #50 from MegaByte875/google_storage

support google storage

Makefile

@@ -25,7 +25,7 @@ docker-push:
 	docker push "${DOCKER_REPO}/nebula-agent:${IMAGE_TAG}"
 
 proto:
-	sh scripts/gen_proto.sh
+	bash scripts/gen_proto.sh
 
 run: build
 	 ./bin/agent

go.mod

@@ -1,23 +1,51 @@
 module github.com/vesoft-inc/nebula-agent/v3
 
-go 1.16
+go 1.20
 
 require (
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/storage v1.36.0
+	github.com/golang/protobuf v1.5.3
+	github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720
 	github.com/sirupsen/logrus v1.8.1
-	google.golang.org/grpc v1.41.0
+	github.com/spf13/afero v1.11.0
+	golang.org/x/oauth2 v0.15.0
+	google.golang.org/api v0.152.0
+	google.golang.org/grpc v1.59.0
+)
+
+require (
+	cloud.google.com/go v0.110.10 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	cloud.google.com/go/iam v1.1.5 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
 )
 
 require (
 	github.com/aws/aws-sdk-go v1.42.22
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
-	github.com/google/uuid v1.3.0
+	github.com/google/uuid v1.4.0
 	github.com/juju/ratelimit v1.0.1
-	github.com/kr/pretty v0.3.0 // indirect
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.1
 	github.com/vesoft-inc/fbthrift v0.0.0-20230214024353-fa2f34755b28
 	github.com/vesoft-inc/nebula-go/v3 v3.6.2-0.20240108060629-6eb07e9b9e0f
 	golang.org/x/net v0.20.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

internal/utils/increment.go

@@ -2,8 +2,8 @@ package utils
 
 import (
 	"fmt"
-	"io/ioutil"
 	"math"
+	"os"
 	"path"
 	"strconv"
 	"strings"
@@ -16,7 +16,7 @@ const (
 
 // LoadIncrFiles load incremental wal file and commitlog.id file
 func LoadIncrFiles(srcDir string, commitLogId, lastLogId int64) ([]string, error) {
-	entries, err := ioutil.ReadDir(srcDir)
+	entries, err := os.ReadDir(srcDir)
 	if err != nil {
 		return nil, err
 	}