bump ginkgo to v2.19.1

pivotal-cf · Jul 31, 2024 · f4b81b1 · f4b81b1
1 parent cc7cc9d
commit f4b81b1
Show file tree

Hide file tree

Showing 249 changed files with 952 additions and 576 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Test
         run: |
-          go install github.com/onsi/ginkgo/ginkgo
+          go install github.com/onsi/ginkgo/v2
           ginkgo -r -race -succinct -randomizeAllSpecs -randomizeSuites -keepGoing \
               -skipPackage acceptance,vmlifecyclecommands,vmmanagers \
               -covermode=atomic -coverprofile=coverage.out .

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -51,7 +51,7 @@ docker run \
   -v $(pwd):/workspace \
   -w /workspace internalpcfplatformautomation/ci:testing \
   /bin/bash \
-  -c "go install github.com/onsi/ginkgo/ginkgo && CGO_ENABLED=1 ginkgo -r -race -succinct -randomizeAllSpecs -randomizeSuites -keepGoing -skipPackage acceptance,vmlifecyclecommands,vmmanagers"
+  -c "go install github.com/onsi/ginkgo/v2 && CGO_ENABLED=1 ginkgo -r -race -succinct -randomizeAllSpecs -randomizeSuites -keepGoing -skipPackage acceptance,vmlifecyclecommands,vmmanagers"
 ```
 
 This follows the setup that we use in our CI pipeline.

diff --git a/acceptance/activate_certificate_authority_test.go b/acceptance/activate_certificate_authority_test.go
@@ -1,11 +1,12 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

diff --git a/acceptance/apply_changes_test.go b/acceptance/apply_changes_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/assign_multi_stemcell_test.go b/acceptance/assign_multi_stemcell_test.go
@@ -1,15 +1,16 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 	"time"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/assign_stemcell_test.go b/acceptance/assign_stemcell_test.go
@@ -1,15 +1,16 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 	"time"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/available_products_test.go b/acceptance/available_products_test.go
@@ -1,14 +1,15 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/certificate_authorities_test.go b/acceptance/certificate_authorities_test.go
@@ -1,13 +1,14 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/certificate_authority_test.go b/acceptance/certificate_authority_test.go
@@ -1,13 +1,14 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/config_template_test.go b/acceptance/config_template_test.go
@@ -12,8 +12,7 @@ import (
 
 	"github.com/onsi/gomega/ghttp"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

diff --git a/acceptance/configure_authentication_test.go b/acceptance/configure_authentication_test.go
@@ -1,14 +1,15 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/configure_director_test.go b/acceptance/configure_director_test.go
@@ -1,12 +1,13 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"io/ioutil"
 	"net/http"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/acceptance/configure_ldap_authentication_test.go b/acceptance/configure_ldap_authentication_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/configure_product_test.go b/acceptance/configure_product_test.go
@@ -2,13 +2,14 @@ package acceptance
 
 import (
 	"fmt"
-	"github.com/onsi/gomega/ghttp"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/acceptance/configure_saml_authentication_test.go b/acceptance/configure_saml_authentication_test.go
@@ -1,14 +1,15 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/create_certificate_authority_test.go b/acceptance/create_certificate_authority_test.go
@@ -1,11 +1,12 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

diff --git a/acceptance/create_vm_extension_test.go b/acceptance/create_vm_extension_test.go
@@ -1,10 +1,11 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

diff --git a/acceptance/credential_references_test.go b/acceptance/credential_references_test.go
@@ -1,13 +1,14 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/credentials_test.go b/acceptance/credentials_test.go
@@ -1,13 +1,14 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/curl_test.go b/acceptance/curl_test.go
@@ -1,11 +1,12 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

diff --git a/acceptance/delete_certificate_authority_test.go b/acceptance/delete_certificate_authority_test.go
@@ -1,11 +1,12 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

diff --git a/acceptance/delete_installation_test.go b/acceptance/delete_installation_test.go
@@ -1,14 +1,15 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
+	"github.com/onsi/gomega/ghttp"
+
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/acceptance/delete_product_test.go b/acceptance/delete_product_test.go
@@ -1,10 +1,11 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

diff --git a/acceptance/delete_unused_products_test.go b/acceptance/delete_unused_products_test.go
@@ -1,10 +1,11 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/acceptance/deployed_manifest_test.go b/acceptance/deployed_manifest_test.go
@@ -1,11 +1,12 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

diff --git a/acceptance/deployed_products_test.go b/acceptance/deployed_products_test.go
@@ -1,11 +1,12 @@
 package acceptance
 
 import (
-	"github.com/onsi/gomega/ghttp"
 	"net/http"
 	"os/exec"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/ghttp"
+
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )