Ft ginkgo v2

Makefile

@@ -11,6 +11,8 @@ init:
 	go install github.com/swaggo/swag/cmd/swag@v1.7.6
 	# for make mock
 	go install github.com/golang/mock/mockgen@v1.4.4
+	# for ginkgo
+	go install github.com/onsi/ginkgo/v2/ginkgo@latest
 
 dep:
 	go mod tidy

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/json-iterator/go v1.1.12
-	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/ginkgo/v2 v2.0.0
 	github.com/onsi/gomega v1.17.0
 	github.com/parnurzeal/gorequest v0.2.16
 	github.com/patrickmn/go-cache v2.1.0+incompatible
@@ -78,7 +78,6 @@ require (
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -108,7 +107,6 @@ require (
 	golang.org/x/tools v0.1.8 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

go.sum

@@ -342,6 +342,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -561,6 +562,8 @@ github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISq
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=

iam_suite_test.go

@@ -13,7 +13,7 @@ package main_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/pdp/condition/and_test.go

@@ -11,7 +11,7 @@
 package condition
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/condition/operator"

pkg/abac/pdp/condition/any_test.go

@@ -11,7 +11,7 @@
 package condition
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/abac/pdp/condition/base_condition_test.go

@@ -14,7 +14,7 @@ import (
 	"errors"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/abac/pdp/condition/base_logical_condition_test.go

@@ -1,7 +1,7 @@
 package condition
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/abac/pdp/condition/bool_test.go

@@ -11,7 +11,7 @@
 package condition
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/abac/pdp/condition/condition_suite_test.go

@@ -13,7 +13,7 @@ package condition_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/pdp/condition/init_test.go

@@ -11,7 +11,7 @@
 package condition
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/types"

pkg/abac/pdp/condition/numeric_cmp_test.go

@@ -12,7 +12,7 @@ package condition
 
 import (
 	"github.com/TencentBlueKing/iam-go-sdk/expression/eval"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/condition/operator"

pkg/abac/pdp/condition/or_test.go

@@ -11,7 +11,7 @@
 package condition
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/condition/operator"

pkg/abac/pdp/condition/string_equals_test.go

@@ -11,7 +11,7 @@
 package condition
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/abac/pdp/condition/string_prefix_test.go

@@ -13,7 +13,7 @@ package condition
 import (
 	abacTypes "iam/pkg/abac/types"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/abac/pdp/entrance_test.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/condition"

pkg/abac/pdp/evalctx/context_test.go

@@ -19,7 +19,7 @@ import (
 	"iam/pkg/abac/pdp/condition"
 	pdptypes "iam/pkg/abac/pdp/types"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	gocache "github.com/patrickmn/go-cache"
 	"github.com/stretchr/testify/assert"
 

pkg/abac/pdp/evalctx/evalctx_suite_test.go

@@ -3,7 +3,7 @@ package evalctx_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/pdp/evaluation/evaluation_suite_test.go

@@ -13,7 +13,7 @@ package evaluation_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/pdp/evaluation/evaluation_test.go

@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/TencentBlueKing/gopkg/cache/memory"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/condition"

pkg/abac/pdp/helper_test.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/condition"

pkg/abac/pdp/pdp_suite_test.go

@@ -13,7 +13,7 @@ package pdp_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/pdp/remote_test.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/types"

pkg/abac/pdp/translate/translate_suite_test.go

@@ -13,7 +13,7 @@ package translate_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/pdp/translate/translate_test.go

@@ -13,7 +13,7 @@ package translate
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/condition"
@@ -74,8 +74,8 @@ var _ = Describe("Expression", func() {
 				assert.NoError(GinkgoT(), err)
 				assert.Equal(GinkgoT(), "OR", expr["op"])
 				assert.ElementsMatch(GinkgoT(), want["content"], expr["content"])
-				//assert.Equal(GinkgoT(), want, expr)
-				//assert.True(GinkgoT(), assert.ObjectsAreEqualValues(want, expr))
+				// assert.Equal(GinkgoT(), want, expr)
+				// assert.True(GinkgoT(), assert.ObjectsAreEqualValues(want, expr))
 
 			})
 

pkg/abac/pdp/types/object_test.go

@@ -13,7 +13,7 @@ package types
 import (
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/abac/pdp/types/policy_condition_test.go

@@ -1,7 +1,7 @@
 package types_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pdp/types"

pkg/abac/pdp/types/types_suite_test.go

@@ -13,7 +13,7 @@ package types_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/pdp/types/util_test.go

@@ -11,7 +11,7 @@
 package types
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/abac/pip/action_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pip"

pkg/abac/pip/pip_suite_test.go

@@ -13,7 +13,7 @@ package pip_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/pip/resource_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pip"

pkg/abac/pip/subject_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/pip"

pkg/abac/prp/common/changelist_test.go

@@ -17,7 +17,7 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	rds "github.com/go-redis/redis/v8"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/abac/prp/common"

pkg/abac/prp/common/common_suite_test.go

@@ -13,7 +13,7 @@ package common_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

pkg/abac/prp/expression/database_test.go

@@ -15,34 +15,35 @@ import (
 
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"iam/pkg/service"
 	"iam/pkg/service/mock"
-
 	"iam/pkg/service/types"
 )
 
 var _ = Describe("Database", func() {
 
 	Describe("newDatabaseRetriever", func() {
-		var ctl *gomock.Controller
-		var patches *gomonkey.Patches
+		It("ok", func() {
+			var ctl *gomock.Controller
+			var patches *gomonkey.Patches
 
-		ctl = gomock.NewController(GinkgoT())
-		patches = gomonkey.NewPatches()
+			ctl = gomock.NewController(GinkgoT())
+			patches = gomonkey.NewPatches()
 
-		mockPolicyService := mock.NewMockPolicyService(ctl)
-		patches.ApplyFunc(service.NewPolicyService, func() service.PolicyService {
-			return mockPolicyService
-		})
+			mockPolicyService := mock.NewMockPolicyService(ctl)
+			patches.ApplyFunc(service.NewPolicyService, func() service.PolicyService {
+				return mockPolicyService
+			})
 
-		r := newDatabaseRetriever()
-		assert.NotNil(GinkgoT(), r)
+			r := newDatabaseRetriever()
+			assert.NotNil(GinkgoT(), r)
 
-		ctl.Finish()
-		patches.Reset()
+			ctl.Finish()
+			patches.Reset()
+		})
 	})
 
 	Describe("retrieve", func() {