Skip to content

Commit

Permalink
update go.mod module version to /v2 (easegress-io#1045)
Browse files Browse the repository at this point in the history
* update go.mod module version to /v2

* update based on github action
  • Loading branch information
suchen-sci committed Jul 24, 2023
1 parent 3904080 commit 1045dfb
Show file tree
Hide file tree
Showing 303 changed files with 1,090 additions and 1,081 deletions.
12 changes: 6 additions & 6 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ builds:
- darwin
ldflags:
- -s -w
- -X github.com/megaease/easegress/pkg/version.RELEASE={{ .Tag }}
- -X github.com/megaease/easegress/pkg/version.COMMIT={{.Commit}}
- -X github.com/megaease/easegress/pkg/version.REPO=megaease/easegress
- -X github.com/megaease/easegress/v2/pkg/version.RELEASE={{ .Tag }}
- -X github.com/megaease/easegress/v2/pkg/version.COMMIT={{.Commit}}
- -X github.com/megaease/easegress/v2/pkg/version.REPO=megaease/easegress

- id: server
main: cmd/server/main.go
Expand All @@ -37,9 +37,9 @@ builds:
- darwin
ldflags:
- -s -w
- -X github.com/megaease/easegress/pkg/version.RELEASE={{ .Tag }}
- -X github.com/megaease/easegress/pkg/version.COMMIT={{.Commit}}
- -X github.com/megaease/easegress/pkg/version.REPO=megaease/easegress
- -X github.com/megaease/easegress/v2/pkg/version.RELEASE={{ .Tag }}
- -X github.com/megaease/easegress/v2/pkg/version.COMMIT={{.Commit}}
- -X github.com/megaease/easegress/v2/pkg/version.REPO=megaease/easegress

archives:
- id: easegress
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ifndef GIT_COMMIT
endif

# Build Flags
GO_LD_FLAGS= "-s -w -X github.com/megaease/easegress/pkg/version.RELEASE=${RELEASE} -X github.com/megaease/easegress/pkg/version.COMMIT=${GIT_COMMIT} -X github.com/megaease/easegress/pkg/version.REPO=${GIT_REPO_INFO}"
GO_LD_FLAGS= "-s -w -X github.com/megaease/easegress/v2/pkg/version.RELEASE=${RELEASE} -X github.com/megaease/easegress/v2/pkg/version.COMMIT=${GIT_COMMIT} -X github.com/megaease/easegress/v2/pkg/version.REPO=${GIT_REPO_INFO}"

# Cgo is disabled by default
ENABLE_CGO= CGO_ENABLED=0
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/command/alias.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// Package command provides the commands.
package command

import "github.com/megaease/easegress/cmd/client/general"
import "github.com/megaease/easegress/v2/cmd/client/general"

var makePath = general.MakePath

Expand Down
4 changes: 2 additions & 2 deletions cmd/client/command/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"net/http"
"strings"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/pkg/util/codectool"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/client/command/visitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"io"
"os"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/util/yaml"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/commandv2/alias.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// Package commandv2 provides the new version of commands.
package commandv2

import "github.com/megaease/easegress/cmd/client/general"
import "github.com/megaease/easegress/v2/cmd/client/general"

var makePath = general.MakePath
var handleReq = general.HandleRequest
Expand Down
4 changes: 2 additions & 2 deletions cmd/client/commandv2/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ package commandv2
import (
"errors"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/cmd/client/resources"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/resources"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/client/commandv2/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"errors"
"fmt"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/pkg/util/codectool"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/client/commandv2/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ package commandv2
import (
"errors"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/cmd/client/resources"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/resources"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/client/commandv2/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ package commandv2
import (
"fmt"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/cmd/client/resources"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/resources"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/client/commandv2/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ package commandv2
import (
"fmt"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/cmd/client/resources"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/resources"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/client/commandv2/general.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"sort"
"strings"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/cmd/client/resources"
"github.com/megaease/easegress/pkg/api"
"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/resources"
"github.com/megaease/easegress/v2/pkg/api"
"github.com/megaease/easegress/v2/pkg/util/codectool"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -123,7 +123,7 @@ func APIResourcesCmd() *cobra.Command {
Use: "api-resources",
Short: "View all API resources",
Run: func(cmd *cobra.Command, args []string) {
resources, err := resources.ObjectApiResources()
resources, err := resources.ObjectAPIResources()
if err != nil {
general.ExitWithError(err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/client/commandv2/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"fmt"
"strings"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/cmd/client/resources"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/resources"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/client/commandv2/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"errors"
"net/http"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/client/commandv2/wasm.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"net/http"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/client/general/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"os"
"path"

"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/v2/pkg/util/codectool"
)

type (
Expand Down
7 changes: 5 additions & 2 deletions cmd/client/general/print.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"text/tabwriter"
"time"

"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/pkg/util/stringtool"
"github.com/megaease/easegress/v2/pkg/util/codectool"
"github.com/megaease/easegress/v2/pkg/util/stringtool"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -278,6 +278,7 @@ func GenerateExampleFromChild(cmd *cobra.Command) {
cmd.Example = example
}

// Filter filters the array by using filter function.
func Filter[T any](array []T, filter func(value T) bool) []T {
var result []T
for _, v := range array {
Expand All @@ -288,6 +289,7 @@ func Filter[T any](array []T, filter func(value T) bool) []T {
return result
}

// Find finds the first element in the array by using find function.
func Find[T any](array []T, find func(value T) bool) (*T, bool) {
for _, v := range array {
if find(v) {
Expand All @@ -297,6 +299,7 @@ func Find[T any](array []T, find func(value T) bool) (*T, bool) {
return nil, false
}

// Map maps the array by using map function.
func Map[T1 any, T2 any](array []T1, mapF func(value T1) T2) []T2 {
var result []T2
for _, v := range array {
Expand Down
6 changes: 3 additions & 3 deletions cmd/client/general/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"os"
"strings"

"github.com/megaease/easegress/pkg/api"
"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/pkg/util/stringtool"
"github.com/megaease/easegress/v2/pkg/api"
"github.com/megaease/easegress/v2/pkg/util/codectool"
"github.com/megaease/easegress/v2/pkg/util/stringtool"
)

// MakeURL is used to make URL for given path.
Expand Down
6 changes: 3 additions & 3 deletions cmd/client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ package main
import (
"github.com/spf13/cobra"

"github.com/megaease/easegress/cmd/client/command"
"github.com/megaease/easegress/cmd/client/commandv2"
"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/command"
"github.com/megaease/easegress/v2/cmd/client/commandv2"
"github.com/megaease/easegress/v2/cmd/client/general"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/client/resources/alias.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// Package resources provides the resources utilities for the client.
package resources

import "github.com/megaease/easegress/cmd/client/general"
import "github.com/megaease/easegress/v2/cmd/client/general"

var makePath = general.MakePath
var handleReq = general.HandleRequest
8 changes: 4 additions & 4 deletions cmd/client/resources/customdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"strconv"
"strings"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/pkg/api"
"github.com/megaease/easegress/pkg/cluster/customdata"
"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/pkg/api"
"github.com/megaease/easegress/v2/pkg/cluster/customdata"
"github.com/megaease/easegress/v2/pkg/util/codectool"
"github.com/spf13/cobra"
)

Expand Down
12 changes: 6 additions & 6 deletions cmd/client/resources/member.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"net/http"
"time"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/pkg/api"
"github.com/megaease/easegress/pkg/cluster"
"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/pkg/api"
"github.com/megaease/easegress/v2/pkg/cluster"
"github.com/megaease/easegress/v2/pkg/util/codectool"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -113,7 +113,7 @@ func printMemberStatusDescription(memberStatus []*cluster.MemberStatus) {
}

// DeleteMember deletes the member.
func DeleteMember(cmd *cobra.Command, names []string) error {
func DeleteMember(_ *cobra.Command, names []string) error {
for _, name := range names {
_, err := handleReq(http.MethodDelete, makePath(general.MemberItemURL, name), nil)
if err != nil {
Expand All @@ -125,7 +125,7 @@ func DeleteMember(cmd *cobra.Command, names []string) error {
}

// GetMember gets the member.
func GetMember(cmd *cobra.Command, args *general.ArgInfo) (err error) {
func GetMember(_ *cobra.Command, args *general.ArgInfo) (err error) {
msg := "all " + MemberKind
if args.ContainName() {
msg = fmt.Sprintf("%s %s", MemberKind, args.Name)
Expand Down
14 changes: 7 additions & 7 deletions cmd/client/resources/object.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ import (
"strings"
"time"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/pkg/api"
"github.com/megaease/easegress/pkg/cluster"
"github.com/megaease/easegress/pkg/supervisor"
"github.com/megaease/easegress/pkg/util/codectool"
"github.com/megaease/easegress/v2/cmd/client/general"
"github.com/megaease/easegress/v2/pkg/api"
"github.com/megaease/easegress/v2/pkg/cluster"
"github.com/megaease/easegress/v2/pkg/supervisor"
"github.com/megaease/easegress/v2/pkg/util/codectool"
"github.com/spf13/cobra"
)

// ObjectApiResources returns the object api resources.
func ObjectApiResources() ([]*api.APIResource, error) {
// ObjectAPIResources returns the object api resources.
func ObjectAPIResources() ([]*api.APIResource, error) {
url := makePath(general.ObjectAPIResources)
body, err := handleReq(http.MethodGet, url, nil)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/client/resources/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package resources
import (
"fmt"

"github.com/megaease/easegress/cmd/client/general"
"github.com/megaease/easegress/v2/cmd/client/general"
)

// GetResourceKind returns the kind of the resource.
Expand All @@ -35,7 +35,7 @@ func GetResourceKind(arg string) (string, error) {
if general.InAPIResource(arg, Member()) {
return Member().Kind, nil
}
objects, err := ObjectApiResources()
objects, err := ObjectAPIResources()
if err != nil {
return "", err
}
Expand Down
22 changes: 11 additions & 11 deletions cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ import (
"sync"
"time"

"github.com/megaease/easegress/pkg/api"
"github.com/megaease/easegress/pkg/cluster"
"github.com/megaease/easegress/pkg/common"
"github.com/megaease/easegress/pkg/env"
"github.com/megaease/easegress/pkg/graceupdate"
"github.com/megaease/easegress/pkg/logger"
"github.com/megaease/easegress/pkg/option"
"github.com/megaease/easegress/pkg/pidfile"
"github.com/megaease/easegress/pkg/profile"
"github.com/megaease/easegress/pkg/supervisor"
"github.com/megaease/easegress/pkg/version"
"github.com/megaease/easegress/v2/pkg/api"
"github.com/megaease/easegress/v2/pkg/cluster"
"github.com/megaease/easegress/v2/pkg/common"
"github.com/megaease/easegress/v2/pkg/env"
"github.com/megaease/easegress/v2/pkg/graceupdate"
"github.com/megaease/easegress/v2/pkg/logger"
"github.com/megaease/easegress/v2/pkg/option"
"github.com/megaease/easegress/v2/pkg/pidfile"
"github.com/megaease/easegress/v2/pkg/profile"
"github.com/megaease/easegress/v2/pkg/supervisor"
"github.com/megaease/easegress/v2/pkg/version"
)

// RunServer runs Easegress server.
Expand Down
4 changes: 2 additions & 2 deletions cmd/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package main

import (
"github.com/megaease/easegress/cmd"
_ "github.com/megaease/easegress/pkg/registry"
"github.com/megaease/easegress/v2/cmd"
_ "github.com/megaease/easegress/v2/pkg/registry"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion doc/cookbook/migrate-v1-filter-to-v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ return result
```go
import (
// ...
"github.com/megaease/easegress/pkg/object/httppipeline" // remove this line
"github.com/megaease/easegress/v2/pkg/object/httppipeline" // remove this line
// ...
)

Expand Down
Loading

0 comments on commit 1045dfb

Please sign in to comment.