migrate ginkgo to v2 (#8826)

* Migrate ginkgo to v2 * Update test/e2e/annotations/ipwhitelist.go Co-authored-by: Jintao Zhang <tao12345666333@163.com> * Update test/e2e/annotations/modsecurity/modsecurity.go Co-authored-by: Jintao Zhang <tao12345666333@163.com> * Update test/e2e/settings/access_log.go Co-authored-by: Jintao Zhang <tao12345666333@163.com> * remove unnecessary blank line * re-order packages * less change Co-authored-by: Jintao Zhang <tao12345666333@163.com>
2022-08-01 00:16:28 +08:00 · 2022-08-01 00:16:28 +08:00 · 5b0cc8edca
commit 5b0cc8edca
parent 5e6093cf59
129 changed files with 152 additions and 156 deletions
--- a/test/e2e/annotations/affinity.go
+++ b/test/e2e/annotations/affinity.go
@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 	networking "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
--- a/test/e2e/annotations/affinitymode.go
+++ b/test/e2e/annotations/affinitymode.go
@ -22,7 +22,7 @@ import (
 	"reflect"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/ingress-nginx/test/e2e/framework"
--- a/test/e2e/annotations/alias.go
+++ b/test/e2e/annotations/alias.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/approot.go
+++ b/test/e2e/annotations/approot.go
@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/auth.go
+++ b/test/e2e/annotations/auth.go
@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	corev1 "k8s.io/api/core/v1"
--- a/test/e2e/annotations/authtls.go
+++ b/test/e2e/annotations/authtls.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/backendprotocol.go
+++ b/test/e2e/annotations/backendprotocol.go
@ -19,7 +19,7 @@ package annotations
 import (
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/canary.go
+++ b/test/e2e/annotations/canary.go
@ -23,7 +23,7 @@ import (
 	"regexp"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/ingress-nginx/test/e2e/framework"
--- a/test/e2e/annotations/clientbodybuffersize.go
+++ b/test/e2e/annotations/clientbodybuffersize.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )

--- a/test/e2e/annotations/connection.go
+++ b/test/e2e/annotations/connection.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/cors.go
+++ b/test/e2e/annotations/cors.go
@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/customhttperrors.go
+++ b/test/e2e/annotations/customhttperrors.go
@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 	networking "k8s.io/api/networking/v1"

--- a/test/e2e/annotations/default_backend.go
+++ b/test/e2e/annotations/default_backend.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/disableaccesslog.go
+++ b/test/e2e/annotations/disableaccesslog.go
@ -17,12 +17,12 @@ limitations under the License.
 package annotations

 import (
+	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
-	"net/http"
 )

 var _ = framework.DescribeAnnotation("disable-access-log disable-http-access-log disable-stream-access-log", func() {
--- a/test/e2e/annotations/fastcgi.go
+++ b/test/e2e/annotations/fastcgi.go
@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"

--- a/test/e2e/annotations/forcesslredirect.go
+++ b/test/e2e/annotations/forcesslredirect.go
@ -19,7 +19,7 @@ package annotations
 import (
 	"net/http"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/fromtowwwredirect.go
+++ b/test/e2e/annotations/fromtowwwredirect.go
@ -22,7 +22,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/ingress-nginx/test/e2e/framework"
--- a/test/e2e/annotations/globalratelimit.go
+++ b/test/e2e/annotations/globalratelimit.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/ingress-nginx/test/e2e/framework"
--- a/test/e2e/annotations/grpc.go
+++ b/test/e2e/annotations/grpc.go
@ -22,7 +22,7 @@ import (
 	"strings"

 	pb "github.com/moul/pb/grpcbin/go-grpc"
-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
--- a/test/e2e/annotations/http2pushpreload.go
+++ b/test/e2e/annotations/http2pushpreload.go
@ -19,7 +19,7 @@ package annotations
 import (
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/influxdb.go
+++ b/test/e2e/annotations/influxdb.go
@ -26,7 +26,7 @@ import (
 	"time"

 	jsoniter "github.com/json-iterator/go"
-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
--- a/test/e2e/annotations/ipwhitelist.go
+++ b/test/e2e/annotations/ipwhitelist.go
@ -19,7 +19,8 @@ package annotations
 import (
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
+
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )

--- a/test/e2e/annotations/limitconnections.go
+++ b/test/e2e/annotations/limitconnections.go
@ -22,7 +22,7 @@ import (
 	"strings"
 	"sync"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/ingress-nginx/test/e2e/framework"
--- a/test/e2e/annotations/limitrate.go
+++ b/test/e2e/annotations/limitrate.go
@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/log.go
+++ b/test/e2e/annotations/log.go
@ -19,7 +19,7 @@ package annotations
 import (
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/mirror.go
+++ b/test/e2e/annotations/mirror.go
@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/modsecurity/modsecurity.go
+++ b/test/e2e/annotations/modsecurity/modsecurity.go
@ -20,7 +20,8 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
+
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )

--- a/test/e2e/annotations/preservetrailingslash.go
+++ b/test/e2e/annotations/preservetrailingslash.go
@ -19,7 +19,7 @@ package annotations
 import (
 	"net/http"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/proxy.go
+++ b/test/e2e/annotations/proxy.go
@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/proxyssl.go
+++ b/test/e2e/annotations/proxyssl.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/ingress-nginx/test/e2e/framework"
--- a/test/e2e/annotations/redirect.go
+++ b/test/e2e/annotations/redirect.go
@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/rewrite.go
+++ b/test/e2e/annotations/rewrite.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/ingress-nginx/test/e2e/framework"
--- a/test/e2e/annotations/satisfy.go
+++ b/test/e2e/annotations/satisfy.go
@ -23,7 +23,7 @@ import (
 	"net/url"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	networking "k8s.io/api/networking/v1"
--- a/test/e2e/annotations/serversnippet.go
+++ b/test/e2e/annotations/serversnippet.go
@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/serviceupstream.go
+++ b/test/e2e/annotations/serviceupstream.go
@ -21,7 +21,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/ingress-nginx/test/e2e/framework"
--- a/test/e2e/annotations/snippet.go
+++ b/test/e2e/annotations/snippet.go
@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/sslciphers.go
+++ b/test/e2e/annotations/sslciphers.go
@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/streamsnippet.go
+++ b/test/e2e/annotations/streamsnippet.go
@ -19,14 +19,14 @@ package annotations
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"net/http"
-	"strings"
-
-	"github.com/onsi/ginkgo"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/upstreamhashby.go
+++ b/test/e2e/annotations/upstreamhashby.go
@ -22,7 +22,7 @@ import (
 	"regexp"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"

 	"k8s.io/apimachinery/pkg/util/wait"
--- a/test/e2e/annotations/upstreamvhost.go
+++ b/test/e2e/annotations/upstreamvhost.go
@ -19,7 +19,7 @@ package annotations
 import (
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
--- a/test/e2e/annotations/xforwardedprefix.go
+++ b/test/e2e/annotations/xforwardedprefix.go
@ -20,7 +20,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"

 	"k8s.io/ingress-nginx/test/e2e/framework"
 )