diff --git a/.github/win/integrations/integration-tests.ps1 b/.github/win/integrations/integration-tests.ps1 index e34493a60c2..abf951e9e96 100644 --- a/.github/win/integrations/integration-tests.ps1 +++ b/.github/win/integrations/integration-tests.ps1 @@ -49,7 +49,7 @@ $Env:RUN_ID=(openssl rand -hex 16) $Env:GOFLAGS = "-mod=mod" if ((Get-Command "ginkgo" -ErrorAction SilentlyContinue) -eq $null) { - go install -v github.com/onsi/ginkgo/ginkgo@v1.16.4 + go install -v github.com/onsi/ginkgo/v2/ginkgo@latest } $CF_INT_NAME=(Get-Content $pwd\metadata.json -Raw| Out-String | ConvertFrom-Json).name.trim() diff --git a/.github/workflows/tests-integration-reusable.yml b/.github/workflows/tests-integration-reusable.yml index 8096f9ea388..856e88ee585 100644 --- a/.github/workflows/tests-integration-reusable.yml +++ b/.github/workflows/tests-integration-reusable.yml @@ -112,7 +112,7 @@ jobs: sleep 30 done cat metadata.json | jq -r '.name' - + - name: Install Tools run: | if [[ ${{ inputs.os }} =~ "windows" ]] @@ -240,7 +240,7 @@ jobs: make build - go install github.com/onsi/ginkgo/ginkgo@v1.16.4 + go install github.com/onsi/ginkgo/v2/ginkgo export CF_PASSWORD=${CF_INT_PASSWORD} cf api ${CF_INT_API} --skip-ssl-validation @@ -270,7 +270,7 @@ jobs: make build - go install github.com/onsi/ginkgo/ginkgo@v1.16.4 + go install github.com/onsi/ginkgo/v2/ginkgo export CF_PASSWORD=${CF_INT_PASSWORD} cf api ${CF_INT_API} --skip-ssl-validation diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml index dc3bea482ec..46f288735a3 100644 --- a/.github/workflows/tests-unit.yml +++ b/.github/workflows/tests-unit.yml @@ -67,13 +67,11 @@ jobs: - name: Set Up Test run: | - go install github.com/onsi/ginkgo/ginkgo@v1.16.4 + go install github.com/onsi/ginkgo/v2/ginkgo go install github.com/onsi/gomega/matchers - name: Run Units run: make units - env: - ACK_GINKGO_RC: true units-windows: name: Units Windows @@ -100,7 +98,7 @@ jobs: - name: Set up Test run: | - go install github.com/onsi/ginkgo/ginkgo@v1.16.4 + go install github.com/onsi/ginkgo/v2/ginkgo go install github.com/onsi/gomega/matchers - name: Get build-time dependencies @@ -108,8 +106,6 @@ jobs: choco install --no-progress --limit-output -y make - name: Run Windows Units - env: - ACK_GINKGO_RC: true run: | Get-Command make Get-Item Makefile diff --git a/Makefile b/Makefile index de98d177cac..0ca227556ff 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ REQUIRED_FOR_STATIC_BINARY =-a -tags "netgo" -installsuffix netgo GOSRC = $(shell find . -name "*.go" ! -name "*test.go" ! -name "*fake*" ! -path "./integration/*") UNAME_S := $(shell uname -s) -SLOW_SPEC_THRESHOLD=120 +POLL_PROGRESS_THRESHOLD=120s -GINKGO_FLAGS ?= -r -randomizeAllSpecs -requireSuite -GINKGO_INT_FLAGS = $(GINKGO_FLAGS) -slowSpecThreshold $(SLOW_SPEC_THRESHOLD) +GINKGO_FLAGS ?= -r -randomize-all -require-suite +GINKGO_INT_FLAGS = $(GINKGO_FLAGS) --poll-progress-after $(POLL_PROGRESS_THRESHOLD) ginkgo_int = ginkgo $(GINKGO_INT_FLAGS) -GINKGO_UNITS_FLAGS = $(GINKGO_FLAGS) -randomizeSuites -p +GINKGO_UNITS_FLAGS = $(GINKGO_FLAGS) -randomize-suites ginkgo_units = ginkgo $(GINKGO_UNITS_FLAGS) GOFLAGS := -mod=mod @@ -138,9 +138,9 @@ integration-full-tests: integration-tests-full integration-tests-full: build integration-cleanup integration-isolated integration-push integration-experimental integration-plugin integration-global integration-selfcontained ## Run all isolated, push, experimental, plugin, selfcontained, and global integration tests integration-tests-full-ci: integration-cleanup - $(ginkgo_int) -nodes $(NODES) -flakeAttempts $(FLAKE_ATTEMPTS) \ + $(ginkgo_int) -nodes $(NODES) -flake-attempts $(FLAKE_ATTEMPTS) \ integration/shared/isolated integration/v7/isolated integration/shared/plugin integration/shared/experimental integration/v7/experimental integration/v7/push - $(ginkgo_int) -flakeAttempts $(FLAKE_ATTEMPTS) integration/shared/global integration/v7/global + $(ginkgo_int) -flake-attempts $(FLAKE_ATTEMPTS) integration/shared/global integration/v7/global lint: custom-lint ## Runs all linters and formatters @echo "Running linters..." @@ -200,22 +200,22 @@ test: units ## (synonym for units) units: units-full ## (synonym for units-full) units-plugin: - CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -nodes 1 -flakeAttempts 2 -skipPackage integration ./**/plugin* ./plugin + CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -nodes 1 -flake-attempts 2 -skip-package integration ./**/plugin* ./plugin ifeq ($(OS),Windows_NT) units-non-plugin: @rm -f $(wildcard fixtures/plugins/*.exe) @ginkgo version CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \ - -skipPackage integration,cf\ssh,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword - CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flakeAttempts 3 cf/ssh + -skip-package integration,cf\ssh,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword + CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flake-attempts 3 cf/ssh else units-non-plugin: @rm -f $(wildcard fixtures/plugins/*.exe) @ginkgo version CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \ - -skipPackage integration,cf/ssh,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword - CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flakeAttempts 3 cf/ssh + -skip-package integration,cf/ssh,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword + CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flake-attempts 3 cf/ssh endif units-full: build units-plugin units-non-plugin diff --git a/actor/actionerror/actionerror_suite_test.go b/actor/actionerror/actionerror_suite_test.go index 254f942a8f8..268e4eaae8f 100644 --- a/actor/actionerror/actionerror_suite_test.go +++ b/actor/actionerror/actionerror_suite_test.go @@ -3,7 +3,7 @@ package actionerror_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/duplicate_service_error_test.go b/actor/actionerror/duplicate_service_error_test.go index 101c7edd774..b20248eabf4 100644 --- a/actor/actionerror/duplicate_service_error_test.go +++ b/actor/actionerror/duplicate_service_error_test.go @@ -2,7 +2,7 @@ package actionerror_test import ( "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/duplicate_service_plan_error_test.go b/actor/actionerror/duplicate_service_plan_error_test.go index 5944cf984b5..5064f30a299 100644 --- a/actor/actionerror/duplicate_service_plan_error_test.go +++ b/actor/actionerror/duplicate_service_plan_error_test.go @@ -2,7 +2,7 @@ package actionerror_test import ( "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/enrich_api_errors_test.go b/actor/actionerror/enrich_api_errors_test.go index 0acf73fa9db..d579b5179e9 100644 --- a/actor/actionerror/enrich_api_errors_test.go +++ b/actor/actionerror/enrich_api_errors_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/package_not_found_in_app_error_test.go b/actor/actionerror/package_not_found_in_app_error_test.go index 6aae72411ca..a6bef9120b2 100644 --- a/actor/actionerror/package_not_found_in_app_error_test.go +++ b/actor/actionerror/package_not_found_in_app_error_test.go @@ -2,7 +2,7 @@ package actionerror_test import ( "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/route_not_found_error_test.go b/actor/actionerror/route_not_found_error_test.go index 8c9a670c67b..9e24916afe9 100644 --- a/actor/actionerror/route_not_found_error_test.go +++ b/actor/actionerror/route_not_found_error_test.go @@ -2,7 +2,7 @@ package actionerror_test import ( "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/service_not_found_error_test.go b/actor/actionerror/service_not_found_error_test.go index dd5760e8324..5062830a5c7 100644 --- a/actor/actionerror/service_not_found_error_test.go +++ b/actor/actionerror/service_not_found_error_test.go @@ -2,7 +2,7 @@ package actionerror_test import ( "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/service_plan_not_found_error_test.go b/actor/actionerror/service_plan_not_found_error_test.go index e65261eda2f..d1965ac1dae 100644 --- a/actor/actionerror/service_plan_not_found_error_test.go +++ b/actor/actionerror/service_plan_not_found_error_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/actionerror/space_not_found_error_test.go b/actor/actionerror/space_not_found_error_test.go index a0682186b30..ad8647e8030 100644 --- a/actor/actionerror/space_not_found_error_test.go +++ b/actor/actionerror/space_not_found_error_test.go @@ -2,7 +2,7 @@ package actionerror_test import ( "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/cfnetworkingaction/cfnetworkingaction_suite_test.go b/actor/cfnetworkingaction/cfnetworkingaction_suite_test.go index 061796e1948..40da8cfc05e 100644 --- a/actor/cfnetworkingaction/cfnetworkingaction_suite_test.go +++ b/actor/cfnetworkingaction/cfnetworkingaction_suite_test.go @@ -1,7 +1,7 @@ package cfnetworkingaction_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/actor/cfnetworkingaction/policy_test.go b/actor/cfnetworkingaction/policy_test.go index d1319b509fd..539a7aab427 100644 --- a/actor/cfnetworkingaction/policy_test.go +++ b/actor/cfnetworkingaction/policy_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/actor/actionerror" . "code.cloudfoundry.org/cli/actor/cfnetworkingaction" "code.cloudfoundry.org/cli/actor/cfnetworkingaction/cfnetworkingactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/checksum_test.go b/actor/pluginaction/checksum_test.go index 73792f2bcb3..b1c5306f811 100644 --- a/actor/pluginaction/checksum_test.go +++ b/actor/pluginaction/checksum_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pluginaction" "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/install_test.go b/actor/pluginaction/install_test.go index 1f97895b35b..3bcfa3d5f36 100644 --- a/actor/pluginaction/install_test.go +++ b/actor/pluginaction/install_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/api/plugin/pluginfakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/install_unix_test.go b/actor/pluginaction/install_unix_test.go index 3c5227c5a65..343acd4a56f 100644 --- a/actor/pluginaction/install_unix_test.go +++ b/actor/pluginaction/install_unix_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pluginaction" "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/install_windows_test.go b/actor/pluginaction/install_windows_test.go index f1ce037a6fd..e2576c93684 100644 --- a/actor/pluginaction/install_windows_test.go +++ b/actor/pluginaction/install_windows_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pluginaction" "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/list_test.go b/actor/pluginaction/list_test.go index 0fa9a7a72fd..55ba1158bb0 100644 --- a/actor/pluginaction/list_test.go +++ b/actor/pluginaction/list_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" "code.cloudfoundry.org/cli/api/plugin" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/plugin_info_test.go b/actor/pluginaction/plugin_info_test.go index caf4728ac32..2ec6c6d3e15 100644 --- a/actor/pluginaction/plugin_info_test.go +++ b/actor/pluginaction/plugin_info_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" "code.cloudfoundry.org/cli/api/plugin" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/plugin_repository_test.go b/actor/pluginaction/plugin_repository_test.go index 07e86248717..468e18ea737 100644 --- a/actor/pluginaction/plugin_repository_test.go +++ b/actor/pluginaction/plugin_repository_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" "code.cloudfoundry.org/cli/api/plugin" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pluginaction/pluginaction_suite_test.go b/actor/pluginaction/pluginaction_suite_test.go index 949f243c16e..5dd0ee739b6 100644 --- a/actor/pluginaction/pluginaction_suite_test.go +++ b/actor/pluginaction/pluginaction_suite_test.go @@ -1,7 +1,7 @@ package pluginaction_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/actor/pluginaction/uninstall_test.go b/actor/pluginaction/uninstall_test.go index 5320840f80b..ab032e71178 100644 --- a/actor/pluginaction/uninstall_test.go +++ b/actor/pluginaction/uninstall_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pluginaction" "code.cloudfoundry.org/cli/actor/pluginaction/pluginactionfakes" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/actualize_test.go b/actor/pushaction/actualize_test.go index 9e1d3845dc6..bcaf901e4c2 100644 --- a/actor/pushaction/actualize_test.go +++ b/actor/pushaction/actualize_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/actor/v3action" "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/pushaction/application_config_test.go b/actor/pushaction/application_config_test.go index eea6a972bcc..0a3c98d17df 100644 --- a/actor/pushaction/application_config_test.go +++ b/actor/pushaction/application_config_test.go @@ -17,7 +17,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/pushaction/application_test.go b/actor/pushaction/application_test.go index 3769771664a..57fc6f11cf8 100644 --- a/actor/pushaction/application_test.go +++ b/actor/pushaction/application_test.go @@ -12,8 +12,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/pushaction/apply_test.go b/actor/pushaction/apply_test.go index e31a50ad869..b85c3261272 100644 --- a/actor/pushaction/apply_test.go +++ b/actor/pushaction/apply_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/command_line_settings_test.go b/actor/pushaction/command_line_settings_test.go index 755b3720bfc..159384b49c9 100644 --- a/actor/pushaction/command_line_settings_test.go +++ b/actor/pushaction/command_line_settings_test.go @@ -4,8 +4,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pushaction" "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/command_line_settings_unix_test.go b/actor/pushaction/command_line_settings_unix_test.go index 893d0836251..b18f964ccb7 100644 --- a/actor/pushaction/command_line_settings_unix_test.go +++ b/actor/pushaction/command_line_settings_unix_test.go @@ -7,8 +7,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pushaction" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/command_line_settings_windows_test.go b/actor/pushaction/command_line_settings_windows_test.go index 8c7cc07b7d8..9057d6a7407 100644 --- a/actor/pushaction/command_line_settings_windows_test.go +++ b/actor/pushaction/command_line_settings_windows_test.go @@ -7,8 +7,8 @@ import ( . "code.cloudfoundry.org/cli/actor/pushaction" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/ginkgo/v2/extensions/table" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/domain_test.go b/actor/pushaction/domain_test.go index ffcf711a15b..1cf4307b6ed 100644 --- a/actor/pushaction/domain_test.go +++ b/actor/pushaction/domain_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" "code.cloudfoundry.org/cli/actor/v2action" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/merge_and_validate_settings_and_manifest_test.go b/actor/pushaction/merge_and_validate_settings_and_manifest_test.go index 5f897a26c2e..8fcf0d33cd8 100644 --- a/actor/pushaction/merge_and_validate_settings_and_manifest_test.go +++ b/actor/pushaction/merge_and_validate_settings_and_manifest_test.go @@ -8,8 +8,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pushaction" "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/merge_and_validate_settings_and_manifest_unix_test.go b/actor/pushaction/merge_and_validate_settings_and_manifest_unix_test.go index 89cb6244349..b0b5dbd7625 100644 --- a/actor/pushaction/merge_and_validate_settings_and_manifest_unix_test.go +++ b/actor/pushaction/merge_and_validate_settings_and_manifest_unix_test.go @@ -8,8 +8,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pushaction" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/merge_and_validate_settings_and_manifest_windows_test.go b/actor/pushaction/merge_and_validate_settings_and_manifest_windows_test.go index 29eec480de1..6163faf71a3 100644 --- a/actor/pushaction/merge_and_validate_settings_and_manifest_windows_test.go +++ b/actor/pushaction/merge_and_validate_settings_and_manifest_windows_test.go @@ -10,8 +10,8 @@ import ( . "code.cloudfoundry.org/cli/actor/pushaction" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/ginkgo/v2/extensions/table" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/push_plan_test.go b/actor/pushaction/push_plan_test.go index 9cad9fe9bdd..bec633ec4ff 100644 --- a/actor/pushaction/push_plan_test.go +++ b/actor/pushaction/push_plan_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/v3action" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/pushaction/pushaction_suite_test.go b/actor/pushaction/pushaction_suite_test.go index 99ab1217897..c78acfb29a0 100644 --- a/actor/pushaction/pushaction_suite_test.go +++ b/actor/pushaction/pushaction_suite_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/pushaction" "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" diff --git a/actor/pushaction/read_manifest_test.go b/actor/pushaction/read_manifest_test.go index 6d662751f32..e3d48e3ec29 100644 --- a/actor/pushaction/read_manifest_test.go +++ b/actor/pushaction/read_manifest_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/util/manifest" "github.com/cloudfoundry/bosh-cli/director/template" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/resource_test.go b/actor/pushaction/resource_test.go index 2b68e7d4b27..dbf303f29db 100644 --- a/actor/pushaction/resource_test.go +++ b/actor/pushaction/resource_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" "code.cloudfoundry.org/cli/actor/v2action" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/route_test.go b/actor/pushaction/route_test.go index 554845a2c70..6ebc9db7443 100644 --- a/actor/pushaction/route_test.go +++ b/actor/pushaction/route_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/service_binding_test.go b/actor/pushaction/service_binding_test.go index 90fd3e2ead3..2223a67987f 100644 --- a/actor/pushaction/service_binding_test.go +++ b/actor/pushaction/service_binding_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" "code.cloudfoundry.org/cli/actor/v2action" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/pushaction/version_test.go b/actor/pushaction/version_test.go index a0dd1ba838b..8afd9bfd3b4 100644 --- a/actor/pushaction/version_test.go +++ b/actor/pushaction/version_test.go @@ -3,7 +3,7 @@ package pushaction_test import ( . "code.cloudfoundry.org/cli/actor/pushaction" "code.cloudfoundry.org/cli/actor/pushaction/pushactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/check_target_test.go b/actor/sharedaction/check_target_test.go index a0846072628..d59d7e0994d 100644 --- a/actor/sharedaction/check_target_test.go +++ b/actor/sharedaction/check_target_test.go @@ -6,8 +6,7 @@ import ( "code.cloudfoundry.org/cli/actor/actionerror" . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/help_test.go b/actor/sharedaction/help_test.go index a75256e59ea..60bd52a4893 100644 --- a/actor/sharedaction/help_test.go +++ b/actor/sharedaction/help_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/is_logged_in_test.go b/actor/sharedaction/is_logged_in_test.go index e81803937b5..c6a849c5807 100644 --- a/actor/sharedaction/is_logged_in_test.go +++ b/actor/sharedaction/is_logged_in_test.go @@ -3,7 +3,7 @@ package sharedaction_test import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/is_org_targeted_test.go b/actor/sharedaction/is_org_targeted_test.go index e13bca342f5..0006bcdd593 100644 --- a/actor/sharedaction/is_org_targeted_test.go +++ b/actor/sharedaction/is_org_targeted_test.go @@ -3,7 +3,7 @@ package sharedaction_test import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/is_space_targeted_test.go b/actor/sharedaction/is_space_targeted_test.go index a1bdaca43ae..981f0a992a7 100644 --- a/actor/sharedaction/is_space_targeted_test.go +++ b/actor/sharedaction/is_space_targeted_test.go @@ -3,7 +3,7 @@ package sharedaction_test import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/logging_test.go b/actor/sharedaction/logging_test.go index b713f462eb9..ad32d23f92c 100644 --- a/actor/sharedaction/logging_test.go +++ b/actor/sharedaction/logging_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_darwin_test.go b/actor/sharedaction/resource_darwin_test.go index 21444f4d461..48e8b278d4f 100644 --- a/actor/sharedaction/resource_darwin_test.go +++ b/actor/sharedaction/resource_darwin_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_linux_test.go b/actor/sharedaction/resource_linux_test.go index 525a41444f0..7ef10775d96 100644 --- a/actor/sharedaction/resource_linux_test.go +++ b/actor/sharedaction/resource_linux_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_test.go b/actor/sharedaction/resource_test.go index 46a002ee796..96188bce3f9 100644 --- a/actor/sharedaction/resource_test.go +++ b/actor/sharedaction/resource_test.go @@ -13,7 +13,7 @@ import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_unix_test.go b/actor/sharedaction/resource_unix_test.go index 4de5d12432b..3892c07d871 100644 --- a/actor/sharedaction/resource_unix_test.go +++ b/actor/sharedaction/resource_unix_test.go @@ -12,7 +12,7 @@ import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/resource_windows_test.go b/actor/sharedaction/resource_windows_test.go index 9aa3b6ee290..60087143cdd 100644 --- a/actor/sharedaction/resource_windows_test.go +++ b/actor/sharedaction/resource_windows_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/ykk" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/sharedaction/sharedaction_suite_test.go b/actor/sharedaction/sharedaction_suite_test.go index 192b53011c7..785d8f93c53 100644 --- a/actor/sharedaction/sharedaction_suite_test.go +++ b/actor/sharedaction/sharedaction_suite_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/actor/sharedaction/ssh_test.go b/actor/sharedaction/ssh_test.go index ce193cc9d1b..9a6519f9657 100644 --- a/actor/sharedaction/ssh_test.go +++ b/actor/sharedaction/ssh_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/cli/util/clissh" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/application_instance_test.go b/actor/v2action/application_instance_test.go index e101977030b..fb92d5ee902 100644 --- a/actor/v2action/application_instance_test.go +++ b/actor/v2action/application_instance_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/application_instance_with_stats_test.go b/actor/v2action/application_instance_with_stats_test.go index b16f16e9aab..d4a58e1c487 100644 --- a/actor/v2action/application_instance_with_stats_test.go +++ b/actor/v2action/application_instance_with_stats_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/application_summary_test.go b/actor/v2action/application_summary_test.go index db20aad2c26..062d8d6df2a 100644 --- a/actor/v2action/application_summary_test.go +++ b/actor/v2action/application_summary_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/application_test.go b/actor/v2action/application_test.go index ce135971584..a457bb5b2ef 100644 --- a/actor/v2action/application_test.go +++ b/actor/v2action/application_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/auth_test.go b/actor/v2action/auth_test.go index c8d8ea14f7e..d3609d8cf99 100644 --- a/actor/v2action/auth_test.go +++ b/actor/v2action/auth_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/uaa/constant" "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/buildpack_test.go b/actor/v2action/buildpack_test.go index dc0e7320cf5..39aa8aff93a 100644 --- a/actor/v2action/buildpack_test.go +++ b/actor/v2action/buildpack_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/actor/actionerror" diff --git a/actor/v2action/buildpack_unix_test.go b/actor/v2action/buildpack_unix_test.go index 1f17db4b331..170641cd928 100644 --- a/actor/v2action/buildpack_unix_test.go +++ b/actor/v2action/buildpack_unix_test.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/actor/v2action" diff --git a/actor/v2action/buildpack_windows_test.go b/actor/v2action/buildpack_windows_test.go index 316da52b9e2..4635bc68a72 100644 --- a/actor/v2action/buildpack_windows_test.go +++ b/actor/v2action/buildpack_windows_test.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/actor/v2action" diff --git a/actor/v2action/composite/composite_suite_test.go b/actor/v2action/composite/composite_suite_test.go index 8d9840298d2..c2975941427 100644 --- a/actor/v2action/composite/composite_suite_test.go +++ b/actor/v2action/composite/composite_suite_test.go @@ -3,7 +3,7 @@ package composite_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/composite/service_broker_summary_test.go b/actor/v2action/composite/service_broker_summary_test.go index f1cc19d3e69..e7f05a270b5 100644 --- a/actor/v2action/composite/service_broker_summary_test.go +++ b/actor/v2action/composite/service_broker_summary_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/composite/compositefakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/composite/update_service_instance_test.go b/actor/v2action/composite/update_service_instance_test.go index d7e66d6eec5..57e66e6e768 100644 --- a/actor/v2action/composite/update_service_instance_test.go +++ b/actor/v2action/composite/update_service_instance_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action/composite" "code.cloudfoundry.org/cli/actor/v2action/composite/compositefakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/domain_test.go b/actor/v2action/domain_test.go index 79e6e45b9c9..c787de28dc2 100644 --- a/actor/v2action/domain_test.go +++ b/actor/v2action/domain_test.go @@ -9,8 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/feature_flag_test.go b/actor/v2action/feature_flag_test.go index 1eeae52aa11..26ffd1cc1f8 100644 --- a/actor/v2action/feature_flag_test.go +++ b/actor/v2action/feature_flag_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/job_test.go b/actor/v2action/job_test.go index f0dc4cda844..325a14b90c9 100644 --- a/actor/v2action/job_test.go +++ b/actor/v2action/job_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/logging_test.go b/actor/v2action/logging_test.go index 2a1e8f87387..3b3f49f61b3 100644 --- a/actor/v2action/logging_test.go +++ b/actor/v2action/logging_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/manifest_test.go b/actor/v2action/manifest_test.go index 44d7113f71d..fd1230372e7 100644 --- a/actor/v2action/manifest_test.go +++ b/actor/v2action/manifest_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/v2action/organization_quota_test.go b/actor/v2action/organization_quota_test.go index 1144284b706..341ad13b16d 100644 --- a/actor/v2action/organization_quota_test.go +++ b/actor/v2action/organization_quota_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/organization_summary_test.go b/actor/v2action/organization_summary_test.go index de60e6322c8..c48eef7de11 100644 --- a/actor/v2action/organization_summary_test.go +++ b/actor/v2action/organization_summary_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/organization_test.go b/actor/v2action/organization_test.go index f42a56ba414..a6f3861713d 100644 --- a/actor/v2action/organization_test.go +++ b/actor/v2action/organization_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" uaaconst "code.cloudfoundry.org/cli/api/uaa/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/v2action/resource_test.go b/actor/v2action/resource_test.go index 9a2ec19c193..8730b187a44 100644 --- a/actor/v2action/resource_test.go +++ b/actor/v2action/resource_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/route_test.go b/actor/v2action/route_test.go index 8ecac0d7343..29f4bd3458d 100644 --- a/actor/v2action/route_test.go +++ b/actor/v2action/route_test.go @@ -11,8 +11,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/router_group_test.go b/actor/v2action/router_group_test.go index ac5fd821f45..494f6971bda 100644 --- a/actor/v2action/router_group_test.go +++ b/actor/v2action/router_group_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/router" routererror "code.cloudfoundry.org/cli/api/router/routererror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/security_group_test.go b/actor/v2action/security_group_test.go index c6a0175c27e..8c346e84953 100644 --- a/actor/v2action/security_group_test.go +++ b/actor/v2action/security_group_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_access_test.go b/actor/v2action/service_access_test.go index 7cb5ac8ed66..98bbf89d370 100644 --- a/actor/v2action/service_access_test.go +++ b/actor/v2action/service_access_test.go @@ -3,7 +3,7 @@ package v2action_test import ( "errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/actor/actionerror" diff --git a/actor/v2action/service_binding_test.go b/actor/v2action/service_binding_test.go index 00a589eaded..4115ed20436 100644 --- a/actor/v2action/service_binding_test.go +++ b/actor/v2action/service_binding_test.go @@ -9,8 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_broker_test.go b/actor/v2action/service_broker_test.go index 841465ec773..edd32a10480 100644 --- a/actor/v2action/service_broker_test.go +++ b/actor/v2action/service_broker_test.go @@ -3,7 +3,7 @@ package v2action_test import ( "errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/actor/actionerror" diff --git a/actor/v2action/service_instance_shared_from_test.go b/actor/v2action/service_instance_shared_from_test.go index b01051a594a..fa018b34c90 100644 --- a/actor/v2action/service_instance_shared_from_test.go +++ b/actor/v2action/service_instance_shared_from_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_instance_shared_to_test.go b/actor/v2action/service_instance_shared_to_test.go index 8e28d2f711d..e2e60386008 100644 --- a/actor/v2action/service_instance_shared_to_test.go +++ b/actor/v2action/service_instance_shared_to_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_instance_summary_test.go b/actor/v2action/service_instance_summary_test.go index c12e4264758..f3653ffd7c6 100644 --- a/actor/v2action/service_instance_summary_test.go +++ b/actor/v2action/service_instance_summary_test.go @@ -9,8 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_instance_test.go b/actor/v2action/service_instance_test.go index ce748a89b81..c8bb85613ac 100644 --- a/actor/v2action/service_instance_test.go +++ b/actor/v2action/service_instance_test.go @@ -10,8 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_instance_user_provided_test.go b/actor/v2action/service_instance_user_provided_test.go index f2a451836a0..60539464b62 100644 --- a/actor/v2action/service_instance_user_provided_test.go +++ b/actor/v2action/service_instance_user_provided_test.go @@ -8,8 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_key_test.go b/actor/v2action/service_key_test.go index 0875a0fff3a..31b65444367 100644 --- a/actor/v2action/service_key_test.go +++ b/actor/v2action/service_key_test.go @@ -3,7 +3,7 @@ package v2action_test import ( "errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/actor/actionerror" diff --git a/actor/v2action/service_plan_test.go b/actor/v2action/service_plan_test.go index d71ab555501..16f9ed585e5 100644 --- a/actor/v2action/service_plan_test.go +++ b/actor/v2action/service_plan_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_plan_visibility_test.go b/actor/v2action/service_plan_visibility_test.go index ced089ca2f1..defa20526b3 100644 --- a/actor/v2action/service_plan_visibility_test.go +++ b/actor/v2action/service_plan_visibility_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_summary_test.go b/actor/v2action/service_summary_test.go index cea9232e2be..f72ba0544fb 100644 --- a/actor/v2action/service_summary_test.go +++ b/actor/v2action/service_summary_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/service_test.go b/actor/v2action/service_test.go index 0bf936f8d25..75deca90421 100644 --- a/actor/v2action/service_test.go +++ b/actor/v2action/service_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/shared_domain_test.go b/actor/v2action/shared_domain_test.go index 70cc061da4f..b7f2066f01c 100644 --- a/actor/v2action/shared_domain_test.go +++ b/actor/v2action/shared_domain_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/space_quota_test.go b/actor/v2action/space_quota_test.go index 70575c7211f..eabdfdeb100 100644 --- a/actor/v2action/space_quota_test.go +++ b/actor/v2action/space_quota_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/space_summary_test.go b/actor/v2action/space_summary_test.go index 4f16fee2181..2506ce63356 100644 --- a/actor/v2action/space_summary_test.go +++ b/actor/v2action/space_summary_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/space_test.go b/actor/v2action/space_test.go index f3f0375efac..92d4a1e8dfb 100644 --- a/actor/v2action/space_test.go +++ b/actor/v2action/space_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" uaaconst "code.cloudfoundry.org/cli/api/uaa/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/ssh_test.go b/actor/v2action/ssh_test.go index 1fef70419fe..2325768c86b 100644 --- a/actor/v2action/ssh_test.go +++ b/actor/v2action/ssh_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/stack_test.go b/actor/v2action/stack_test.go index d8ab1a8960a..2ac32283f55 100644 --- a/actor/v2action/stack_test.go +++ b/actor/v2action/stack_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/target_test.go b/actor/v2action/target_test.go index 1d2c1cd3261..3e91d9680ad 100644 --- a/actor/v2action/target_test.go +++ b/actor/v2action/target_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/token_test.go b/actor/v2action/token_test.go index dc6149041af..47b9d8780b2 100644 --- a/actor/v2action/token_test.go +++ b/actor/v2action/token_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/uaa" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/user_test.go b/actor/v2action/user_test.go index 5fb39c2d53b..aec90ebe785 100644 --- a/actor/v2action/user_test.go +++ b/actor/v2action/user_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/uaa" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2action/v2action_suite_test.go b/actor/v2action/v2action_suite_test.go index 5de5ff05232..33dabe3396f 100644 --- a/actor/v2action/v2action_suite_test.go +++ b/actor/v2action/v2action_suite_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" ) diff --git a/actor/v2action/version_test.go b/actor/v2action/version_test.go index 7e5e90920db..81345880f4b 100644 --- a/actor/v2action/version_test.go +++ b/actor/v2action/version_test.go @@ -3,7 +3,7 @@ package v2action_test import ( . "code.cloudfoundry.org/cli/actor/v2action" "code.cloudfoundry.org/cli/actor/v2action/v2actionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2v3action/application_summary_test.go b/actor/v2v3action/application_summary_test.go index aa72b5a3698..67be073f08c 100644 --- a/actor/v2v3action/application_summary_test.go +++ b/actor/v2v3action/application_summary_test.go @@ -12,8 +12,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2v3action/manifest_test.go b/actor/v2v3action/manifest_test.go index 5be8c6e1a3b..0914e5f2c13 100644 --- a/actor/v2v3action/manifest_test.go +++ b/actor/v2v3action/manifest_test.go @@ -3,7 +3,7 @@ package v2v3action_test import ( "errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/actor/v2v3action/service_instance_test.go b/actor/v2v3action/service_instance_test.go index 001c07333ca..6a177357ca3 100644 --- a/actor/v2v3action/service_instance_test.go +++ b/actor/v2v3action/service_instance_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2v3action/v2v3action_suite_test.go b/actor/v2v3action/v2v3action_suite_test.go index b69d614d318..3c2fb7a982e 100644 --- a/actor/v2v3action/v2v3action_suite_test.go +++ b/actor/v2v3action/v2v3action_suite_test.go @@ -3,7 +3,7 @@ package v2v3action_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v2v3action/version_test.go b/actor/v2v3action/version_test.go index 3d790bc0136..a1553cf1a92 100644 --- a/actor/v2v3action/version_test.go +++ b/actor/v2v3action/version_test.go @@ -3,7 +3,7 @@ package v2v3action_test import ( . "code.cloudfoundry.org/cli/actor/v2v3action" "code.cloudfoundry.org/cli/actor/v2v3action/v2v3actionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/application_manifest_test.go b/actor/v3action/application_manifest_test.go index 9e4f3543ebc..68e3c8363ba 100644 --- a/actor/v3action/application_manifest_test.go +++ b/actor/v3action/application_manifest_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/application_summary_test.go b/actor/v3action/application_summary_test.go index 39b9743e2c3..9909bdb33ff 100644 --- a/actor/v3action/application_summary_test.go +++ b/actor/v3action/application_summary_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/application_test.go b/actor/v3action/application_test.go index a603e66cd4c..c41a3bb1a44 100644 --- a/actor/v3action/application_test.go +++ b/actor/v3action/application_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/application_with_process_summary_test.go b/actor/v3action/application_with_process_summary_test.go index 666fc430ae7..92b3113d507 100644 --- a/actor/v3action/application_with_process_summary_test.go +++ b/actor/v3action/application_with_process_summary_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/auth_test.go b/actor/v3action/auth_test.go index a7c19067c72..486c2f845f9 100644 --- a/actor/v3action/auth_test.go +++ b/actor/v3action/auth_test.go @@ -3,7 +3,7 @@ package v3action_test import ( "errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/actor/actionerror" diff --git a/actor/v3action/build_test.go b/actor/v3action/build_test.go index 383fe0e4a19..cd8b08c8898 100644 --- a/actor/v3action/build_test.go +++ b/actor/v3action/build_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/droplet_test.go b/actor/v3action/droplet_test.go index ac1f1dfb075..e22a40d567a 100644 --- a/actor/v3action/droplet_test.go +++ b/actor/v3action/droplet_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/environment_variable_test.go b/actor/v3action/environment_variable_test.go index 24fdd2e45e1..b80907bfba2 100644 --- a/actor/v3action/environment_variable_test.go +++ b/actor/v3action/environment_variable_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/isolation_segment_test.go b/actor/v3action/isolation_segment_test.go index e4386ac3a79..9b8e8065520 100644 --- a/actor/v3action/isolation_segment_test.go +++ b/actor/v3action/isolation_segment_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/logcache_test.go b/actor/v3action/logcache_test.go index 767b4b8db93..2539003945e 100644 --- a/actor/v3action/logcache_test.go +++ b/actor/v3action/logcache_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/logging_test.go b/actor/v3action/logging_test.go index f4e38a70382..2b936d1669e 100644 --- a/actor/v3action/logging_test.go +++ b/actor/v3action/logging_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" noaaErrors "github.com/cloudfoundry/noaa/v2/errors" "github.com/cloudfoundry/sonde-go/events" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/organization_test.go b/actor/v3action/organization_test.go index 45bfa0c8327..e8ee48e2b47 100644 --- a/actor/v3action/organization_test.go +++ b/actor/v3action/organization_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/organization_test.go.txt b/actor/v3action/organization_test.go.txt index 5a2089cb0ab..d09484b65da 100644 --- a/actor/v3action/organization_test.go.txt +++ b/actor/v3action/organization_test.go.txt @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/package_test.go b/actor/v3action/package_test.go index 7280416ab38..a6e053bc34a 100644 --- a/actor/v3action/package_test.go +++ b/actor/v3action/package_test.go @@ -15,8 +15,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/v3action/process_health_check_test.go b/actor/v3action/process_health_check_test.go index 2e1142d9727..ffcd48c4aaa 100644 --- a/actor/v3action/process_health_check_test.go +++ b/actor/v3action/process_health_check_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/process_instance_test.go b/actor/v3action/process_instance_test.go index d59f0fa15bd..62fdaba00b6 100644 --- a/actor/v3action/process_instance_test.go +++ b/actor/v3action/process_instance_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/process_summary_test.go b/actor/v3action/process_summary_test.go index b8e1be7ed33..067536f4b93 100644 --- a/actor/v3action/process_summary_test.go +++ b/actor/v3action/process_summary_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/process_test.go b/actor/v3action/process_test.go index b04aa3fe9a4..e72a6460fb2 100644 --- a/actor/v3action/process_test.go +++ b/actor/v3action/process_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/relationship_list_test.go b/actor/v3action/relationship_list_test.go index 2822fbfa2d8..6dc7d8df41a 100644 --- a/actor/v3action/relationship_list_test.go +++ b/actor/v3action/relationship_list_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/service_instance_test.go b/actor/v3action/service_instance_test.go index 6e7901baed2..983224680bf 100644 --- a/actor/v3action/service_instance_test.go +++ b/actor/v3action/service_instance_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/space_test.go b/actor/v3action/space_test.go index 71c2b2c40b7..5ebf86a6a26 100644 --- a/actor/v3action/space_test.go +++ b/actor/v3action/space_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/ssh_test.go b/actor/v3action/ssh_test.go index 2bf14b3786a..00581624e1a 100644 --- a/actor/v3action/ssh_test.go +++ b/actor/v3action/ssh_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/target_test.go b/actor/v3action/target_test.go index fb768dd3898..590083c7a6c 100644 --- a/actor/v3action/target_test.go +++ b/actor/v3action/target_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/task_test.go b/actor/v3action/task_test.go index cb3fd551ebb..994146d3f83 100644 --- a/actor/v3action/task_test.go +++ b/actor/v3action/task_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/v3action_suite_test.go b/actor/v3action/v3action_suite_test.go index c24c5d089bd..7fca82d054c 100644 --- a/actor/v3action/v3action_suite_test.go +++ b/actor/v3action/v3action_suite_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v3action" "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/actor/v3action/version_test.go b/actor/v3action/version_test.go index 3869e2888bd..e5e27457878 100644 --- a/actor/v3action/version_test.go +++ b/actor/v3action/version_test.go @@ -3,7 +3,7 @@ package v3action_test import ( . "code.cloudfoundry.org/cli/actor/v3action" "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v3action/zdt_test.go b/actor/v3action/zdt_test.go index 787f9187eb3..81c0df2ed4a 100644 --- a/actor/v3action/zdt_test.go +++ b/actor/v3action/zdt_test.go @@ -12,7 +12,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v3action" "code.cloudfoundry.org/cli/actor/v3action/v3actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/application_feature_test.go b/actor/v7action/application_feature_test.go index aabe1dff9c0..24990daeada 100644 --- a/actor/v7action/application_feature_test.go +++ b/actor/v7action/application_feature_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/clock/fakeclock" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/application_manifest_test.go b/actor/v7action/application_manifest_test.go index 709fcbbe656..a6c3d1da16c 100644 --- a/actor/v7action/application_manifest_test.go +++ b/actor/v7action/application_manifest_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/clock" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/application_summary_test.go b/actor/v7action/application_summary_test.go index ef136015aab..b306e1a02db 100644 --- a/actor/v7action/application_summary_test.go +++ b/actor/v7action/application_summary_test.go @@ -15,8 +15,8 @@ import ( "code.cloudfoundry.org/clock" "code.cloudfoundry.org/cli/actor/actionerror" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/application_test.go b/actor/v7action/application_test.go index d1e64b735e5..61cfc51956b 100644 --- a/actor/v7action/application_test.go +++ b/actor/v7action/application_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/batcher" "code.cloudfoundry.org/clock/fakeclock" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/auth_test.go b/actor/v7action/auth_test.go index 66f68058673..309ff2e27bf 100644 --- a/actor/v7action/auth_test.go +++ b/actor/v7action/auth_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7action" "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/uaa/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/build_test.go b/actor/v7action/build_test.go index 380188c5bc6..d874528e375 100644 --- a/actor/v7action/build_test.go +++ b/actor/v7action/build_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/clock" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/buildpack_test.go b/actor/v7action/buildpack_test.go index c4d0847497c..4ef71fd2376 100644 --- a/actor/v7action/buildpack_test.go +++ b/actor/v7action/buildpack_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/buildpack_unix_test.go b/actor/v7action/buildpack_unix_test.go index 5df6bd7c727..cc7d551d437 100644 --- a/actor/v7action/buildpack_unix_test.go +++ b/actor/v7action/buildpack_unix_test.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/actor/v7action" diff --git a/actor/v7action/buildpack_windows_test.go b/actor/v7action/buildpack_windows_test.go index eb48786c536..361142df8b2 100644 --- a/actor/v7action/buildpack_windows_test.go +++ b/actor/v7action/buildpack_windows_test.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/actor/v7action" diff --git a/actor/v7action/deployment_test.go b/actor/v7action/deployment_test.go index 0cb8744cc52..9527d7b3cad 100644 --- a/actor/v7action/deployment_test.go +++ b/actor/v7action/deployment_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/domain_test.go b/actor/v7action/domain_test.go index 09e4d3760a3..3e142b0f28f 100644 --- a/actor/v7action/domain_test.go +++ b/actor/v7action/domain_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/router" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/droplet_test.go b/actor/v7action/droplet_test.go index 72f0e78a577..ae21ef84e75 100644 --- a/actor/v7action/droplet_test.go +++ b/actor/v7action/droplet_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/environment_variable_test.go b/actor/v7action/environment_variable_test.go index 81b2aaa738a..c83493c4d22 100644 --- a/actor/v7action/environment_variable_test.go +++ b/actor/v7action/environment_variable_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/event_test.go b/actor/v7action/event_test.go index b8eb6f30c9e..96e58ad3204 100644 --- a/actor/v7action/event_test.go +++ b/actor/v7action/event_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/feature_flag_test.go b/actor/v7action/feature_flag_test.go index 0c245ae55d5..9bee3c3f219 100644 --- a/actor/v7action/feature_flag_test.go +++ b/actor/v7action/feature_flag_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/info_test.go b/actor/v7action/info_test.go index e74e2ca578b..afff422b029 100644 --- a/actor/v7action/info_test.go +++ b/actor/v7action/info_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/isolation_segment_test.go b/actor/v7action/isolation_segment_test.go index 9be1a9d897f..54567453834 100644 --- a/actor/v7action/isolation_segment_test.go +++ b/actor/v7action/isolation_segment_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/job_test.go b/actor/v7action/job_test.go index f80327c4cb5..6ee0ac3430b 100644 --- a/actor/v7action/job_test.go +++ b/actor/v7action/job_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/label_test.go b/actor/v7action/label_test.go index ca7908627fb..1100b904784 100644 --- a/actor/v7action/label_test.go +++ b/actor/v7action/label_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/logging_test.go b/actor/v7action/logging_test.go index 1ee14dd0f59..2ce49da8f4e 100644 --- a/actor/v7action/logging_test.go +++ b/actor/v7action/logging_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" logcache "code.cloudfoundry.org/go-log-cache/v2" "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/marketplace_test.go b/actor/v7action/marketplace_test.go index 6a1ecfffbbb..7849db851a3 100644 --- a/actor/v7action/marketplace_test.go +++ b/actor/v7action/marketplace_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization_quota_test.go b/actor/v7action/organization_quota_test.go index 6cfe1fd21a9..a5153e700f5 100644 --- a/actor/v7action/organization_quota_test.go +++ b/actor/v7action/organization_quota_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization_summary_test.go b/actor/v7action/organization_summary_test.go index c711b4a7d11..9ee72781a08 100644 --- a/actor/v7action/organization_summary_test.go +++ b/actor/v7action/organization_summary_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/clock" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/organization_test.go b/actor/v7action/organization_test.go index a3aa2365054..e6ea5311d62 100644 --- a/actor/v7action/organization_test.go +++ b/actor/v7action/organization_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/package_test.go b/actor/v7action/package_test.go index 57727c9e704..d424a00c3e6 100644 --- a/actor/v7action/package_test.go +++ b/actor/v7action/package_test.go @@ -15,8 +15,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/v7action/process_health_check_test.go b/actor/v7action/process_health_check_test.go index 33d1340b66e..3ba1df8deb6 100644 --- a/actor/v7action/process_health_check_test.go +++ b/actor/v7action/process_health_check_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_instance_test.go b/actor/v7action/process_instance_test.go index 96ecff7c603..f884c2a33c2 100644 --- a/actor/v7action/process_instance_test.go +++ b/actor/v7action/process_instance_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_summary_test.go b/actor/v7action/process_summary_test.go index f5bee52adc4..f34a5ec2811 100644 --- a/actor/v7action/process_summary_test.go +++ b/actor/v7action/process_summary_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/process_test.go b/actor/v7action/process_test.go index 9c95905f316..256dbf33a2b 100644 --- a/actor/v7action/process_test.go +++ b/actor/v7action/process_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/v7action/relationship_list_test.go b/actor/v7action/relationship_list_test.go index aec537166ee..f3991c15082 100644 --- a/actor/v7action/relationship_list_test.go +++ b/actor/v7action/relationship_list_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/resource_match_test.go b/actor/v7action/resource_match_test.go index 1759b2a5baf..688cf387901 100644 --- a/actor/v7action/resource_match_test.go +++ b/actor/v7action/resource_match_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/cf/errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/revisions_test.go b/actor/v7action/revisions_test.go index 176707531da..be162daab86 100644 --- a/actor/v7action/revisions_test.go +++ b/actor/v7action/revisions_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/role_test.go b/actor/v7action/role_test.go index fa280ec8f12..55959cd0119 100644 --- a/actor/v7action/role_test.go +++ b/actor/v7action/role_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/route_test.go b/actor/v7action/route_test.go index 87430f0bfc5..d59157a6055 100644 --- a/actor/v7action/route_test.go +++ b/actor/v7action/route_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/batcher" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/router_group_test.go b/actor/v7action/router_group_test.go index 4c1f5239d16..6892bad5b7e 100644 --- a/actor/v7action/router_group_test.go +++ b/actor/v7action/router_group_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/router" "code.cloudfoundry.org/cli/api/router/routererror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/security_group_test.go b/actor/v7action/security_group_test.go index 132370c63d3..c2cb66492c1 100644 --- a/actor/v7action/security_group_test.go +++ b/actor/v7action/security_group_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/batcher" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_access_test.go b/actor/v7action/service_access_test.go index ec94694a36d..c3f11c00902 100644 --- a/actor/v7action/service_access_test.go +++ b/actor/v7action/service_access_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_broker_test.go b/actor/v7action/service_broker_test.go index 195843f229a..90b2692a60b 100644 --- a/actor/v7action/service_broker_test.go +++ b/actor/v7action/service_broker_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_instance_test.go b/actor/v7action/service_instance_test.go index 10c6b7a1058..9fb614be4fb 100644 --- a/actor/v7action/service_instance_test.go +++ b/actor/v7action/service_instance_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_offering_test.go b/actor/v7action/service_offering_test.go index a0379258dc5..add0f64e302 100644 --- a/actor/v7action/service_offering_test.go +++ b/actor/v7action/service_offering_test.go @@ -9,8 +9,8 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/service_plan_test.go b/actor/v7action/service_plan_test.go index 986b9e44289..079995803a0 100644 --- a/actor/v7action/service_plan_test.go +++ b/actor/v7action/service_plan_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_feature_test.go b/actor/v7action/space_feature_test.go index 8e2bfc05c87..be7a64a925a 100644 --- a/actor/v7action/space_feature_test.go +++ b/actor/v7action/space_feature_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7action" "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_manifest_test.go b/actor/v7action/space_manifest_test.go index 3d14947b0a8..5f6d1f06697 100644 --- a/actor/v7action/space_manifest_test.go +++ b/actor/v7action/space_manifest_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_quota_test.go b/actor/v7action/space_quota_test.go index fed2d91c0c2..6705bd1d374 100644 --- a/actor/v7action/space_quota_test.go +++ b/actor/v7action/space_quota_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/space_test.go b/actor/v7action/space_test.go index b61716344e3..bbf52188305 100644 --- a/actor/v7action/space_test.go +++ b/actor/v7action/space_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/ssh_test.go b/actor/v7action/ssh_test.go index 41bc31ed92c..134e329418e 100644 --- a/actor/v7action/ssh_test.go +++ b/actor/v7action/ssh_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/stack_test.go b/actor/v7action/stack_test.go index 34c225ef05a..28cd6f0ed25 100644 --- a/actor/v7action/stack_test.go +++ b/actor/v7action/stack_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/target_test.go b/actor/v7action/target_test.go index d0b84d158cf..a8a09ea71b2 100644 --- a/actor/v7action/target_test.go +++ b/actor/v7action/target_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/task_test.go b/actor/v7action/task_test.go index 49f5a3cfb05..a8df6f2ebad 100644 --- a/actor/v7action/task_test.go +++ b/actor/v7action/task_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/token_test.go b/actor/v7action/token_test.go index 59e0b2bf3f2..22dc83a0553 100644 --- a/actor/v7action/token_test.go +++ b/actor/v7action/token_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/user_test.go b/actor/v7action/user_test.go index 64520b2ab76..9e1aebec339 100644 --- a/actor/v7action/user_test.go +++ b/actor/v7action/user_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7action/v7action_suite_test.go b/actor/v7action/v7action_suite_test.go index 5d2a56804f8..d7f95d2d11b 100644 --- a/actor/v7action/v7action_suite_test.go +++ b/actor/v7action/v7action_suite_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7action" "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" "code.cloudfoundry.org/clock/fakeclock" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/actor/v7action/version_test.go b/actor/v7action/version_test.go index 34e62e910eb..633f9f5b795 100644 --- a/actor/v7action/version_test.go +++ b/actor/v7action/version_test.go @@ -3,7 +3,7 @@ package v7action_test import ( . "code.cloudfoundry.org/cli/actor/v7action" "code.cloudfoundry.org/cli/actor/v7action/v7actionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/actor_test.go b/actor/v7pushaction/actor_test.go index 88d00aba0e1..d3ebc799729 100644 --- a/actor/v7pushaction/actor_test.go +++ b/actor/v7pushaction/actor_test.go @@ -3,7 +3,7 @@ package v7pushaction_test import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/actualize_test.go b/actor/v7pushaction/actualize_test.go index 4130d35697d..b1e91a08c43 100644 --- a/actor/v7pushaction/actualize_test.go +++ b/actor/v7pushaction/actualize_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/application_test.go b/actor/v7pushaction/application_test.go index 37b111927d3..63af101199f 100644 --- a/actor/v7pushaction/application_test.go +++ b/actor/v7pushaction/application_test.go @@ -5,8 +5,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_bits_package_for_application_test.go b/actor/v7pushaction/create_bits_package_for_application_test.go index dfde7e8cce7..40e96523c44 100644 --- a/actor/v7pushaction/create_bits_package_for_application_test.go +++ b/actor/v7pushaction/create_bits_package_for_application_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_deployment_for_push_plan_test.go b/actor/v7pushaction/create_deployment_for_push_plan_test.go index 3004c6c6246..126eb5dc094 100644 --- a/actor/v7pushaction/create_deployment_for_push_plan_test.go +++ b/actor/v7pushaction/create_deployment_for_push_plan_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_docker_package_for_application_test.go b/actor/v7pushaction/create_docker_package_for_application_test.go index 6b85891691b..29c8674573c 100644 --- a/actor/v7pushaction/create_docker_package_for_application_test.go +++ b/actor/v7pushaction/create_docker_package_for_application_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/actor/v7pushaction/create_droplet_for_application_test.go b/actor/v7pushaction/create_droplet_for_application_test.go index 42e1a83b142..c13603276ab 100644 --- a/actor/v7pushaction/create_droplet_for_application_test.go +++ b/actor/v7pushaction/create_droplet_for_application_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/create_push_plans_test.go b/actor/v7pushaction/create_push_plans_test.go index b15fa64da9d..871026c3adb 100644 --- a/actor/v7pushaction/create_push_plans_test.go +++ b/actor/v7pushaction/create_push_plans_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_app_name_override_test.go b/actor/v7pushaction/handle_app_name_override_test.go index 7c87fad455f..8d58871ce30 100644 --- a/actor/v7pushaction/handle_app_name_override_test.go +++ b/actor/v7pushaction/handle_app_name_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_app_path_override_test.go b/actor/v7pushaction/handle_app_path_override_test.go index a484a26a946..afe18a189cd 100644 --- a/actor/v7pushaction/handle_app_path_override_test.go +++ b/actor/v7pushaction/handle_app_path_override_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/util/manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_buildpacks_override_test.go b/actor/v7pushaction/handle_buildpacks_override_test.go index 6942dfa5681..49c6bc6569d 100644 --- a/actor/v7pushaction/handle_buildpacks_override_test.go +++ b/actor/v7pushaction/handle_buildpacks_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_default_route_override_test.go b/actor/v7pushaction/handle_default_route_override_test.go index a33aed69aa0..cc94e9ad9f1 100644 --- a/actor/v7pushaction/handle_default_route_override_test.go +++ b/actor/v7pushaction/handle_default_route_override_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_disk_override_test.go b/actor/v7pushaction/handle_disk_override_test.go index c87f7749253..3b139bd0728 100644 --- a/actor/v7pushaction/handle_disk_override_test.go +++ b/actor/v7pushaction/handle_disk_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_docker_image_override_test.go b/actor/v7pushaction/handle_docker_image_override_test.go index 77591dc5fb5..9c7c2310539 100644 --- a/actor/v7pushaction/handle_docker_image_override_test.go +++ b/actor/v7pushaction/handle_docker_image_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_docker_username_override_test.go b/actor/v7pushaction/handle_docker_username_override_test.go index 2322b087c0b..0dd9a1cd388 100644 --- a/actor/v7pushaction/handle_docker_username_override_test.go +++ b/actor/v7pushaction/handle_docker_username_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_droplet_path_override_test.go b/actor/v7pushaction/handle_droplet_path_override_test.go index 98dd997f20a..2c0dfdf5e1c 100644 --- a/actor/v7pushaction/handle_droplet_path_override_test.go +++ b/actor/v7pushaction/handle_droplet_path_override_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/util/manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_flag_overrides_test.go b/actor/v7pushaction/handle_flag_overrides_test.go index 88f0135463e..a50450b004f 100644 --- a/actor/v7pushaction/handle_flag_overrides_test.go +++ b/actor/v7pushaction/handle_flag_overrides_test.go @@ -3,7 +3,7 @@ package v7pushaction_test import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/util/manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_health_check_endpoint_override_test.go b/actor/v7pushaction/handle_health_check_endpoint_override_test.go index 8313357eb83..c3cbac2ed78 100644 --- a/actor/v7pushaction/handle_health_check_endpoint_override_test.go +++ b/actor/v7pushaction/handle_health_check_endpoint_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_health_check_timeout_override_test.go b/actor/v7pushaction/handle_health_check_timeout_override_test.go index 6292c4897d3..18fe4c52eaa 100644 --- a/actor/v7pushaction/handle_health_check_timeout_override_test.go +++ b/actor/v7pushaction/handle_health_check_timeout_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_health_check_type_override_test.go b/actor/v7pushaction/handle_health_check_type_override_test.go index 03a353e83fc..695f06b6f86 100644 --- a/actor/v7pushaction/handle_health_check_type_override_test.go +++ b/actor/v7pushaction/handle_health_check_type_override_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_instances_override_test.go b/actor/v7pushaction/handle_instances_override_test.go index b036eddc2f3..4b662ce7cfe 100644 --- a/actor/v7pushaction/handle_instances_override_test.go +++ b/actor/v7pushaction/handle_instances_override_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_memory_override_test.go b/actor/v7pushaction/handle_memory_override_test.go index ff1c7c3e2e1..d301981543c 100644 --- a/actor/v7pushaction/handle_memory_override_test.go +++ b/actor/v7pushaction/handle_memory_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_no_route_override_test.go b/actor/v7pushaction/handle_no_route_override_test.go index 385c0469c88..36b547901c0 100644 --- a/actor/v7pushaction/handle_no_route_override_test.go +++ b/actor/v7pushaction/handle_no_route_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_random_route_override_test.go b/actor/v7pushaction/handle_random_route_override_test.go index 30ccd9fbd21..566ee226f9a 100644 --- a/actor/v7pushaction/handle_random_route_override_test.go +++ b/actor/v7pushaction/handle_random_route_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_stack_override_test.go b/actor/v7pushaction/handle_stack_override_test.go index ed79874f66c..8d7ebb32f93 100644 --- a/actor/v7pushaction/handle_stack_override_test.go +++ b/actor/v7pushaction/handle_stack_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_start_command_override_test.go b/actor/v7pushaction/handle_start_command_override_test.go index 577efc58242..93df0fa065c 100644 --- a/actor/v7pushaction/handle_start_command_override_test.go +++ b/actor/v7pushaction/handle_start_command_override_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_strategy_override_test.go b/actor/v7pushaction/handle_strategy_override_test.go index 57bb0fe6ad4..476636d234c 100644 --- a/actor/v7pushaction/handle_strategy_override_test.go +++ b/actor/v7pushaction/handle_strategy_override_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/util/manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/handle_task_override_test.go b/actor/v7pushaction/handle_task_override_test.go index 7848d9334f2..88700852f05 100644 --- a/actor/v7pushaction/handle_task_override_test.go +++ b/actor/v7pushaction/handle_task_override_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/resource_match_test.go b/actor/v7pushaction/resource_match_test.go index 9471a83578a..e35c7618298 100644 --- a/actor/v7pushaction/resource_match_test.go +++ b/actor/v7pushaction/resource_match_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/restart_application_test.go b/actor/v7pushaction/restart_application_test.go index 33c1fee4c0d..217ebbbc324 100644 --- a/actor/v7pushaction/restart_application_test.go +++ b/actor/v7pushaction/restart_application_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/sequence_test.go b/actor/v7pushaction/sequence_test.go index 0acfffd35df..158725f66c5 100644 --- a/actor/v7pushaction/sequence_test.go +++ b/actor/v7pushaction/sequence_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/set_default_bits_path_for_push_plan_test.go b/actor/v7pushaction/set_default_bits_path_for_push_plan_test.go index d5db9e80885..03ca77503c1 100644 --- a/actor/v7pushaction/set_default_bits_path_for_push_plan_test.go +++ b/actor/v7pushaction/set_default_bits_path_for_push_plan_test.go @@ -3,7 +3,7 @@ package v7pushaction_test import ( "code.cloudfoundry.org/cli/actor/v7action" . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/set_droplet_for_application_test.go b/actor/v7pushaction/set_droplet_for_application_test.go index f28e9be8428..9b543b34cb8 100644 --- a/actor/v7pushaction/set_droplet_for_application_test.go +++ b/actor/v7pushaction/set_droplet_for_application_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_all_resources_for_push_plan_test.go b/actor/v7pushaction/setup_all_resources_for_push_plan_test.go index 628f2ff82d0..6ad8efaf5cf 100644 --- a/actor/v7pushaction/setup_all_resources_for_push_plan_test.go +++ b/actor/v7pushaction/setup_all_resources_for_push_plan_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_deployment_strategy_for_push_plan_test.go b/actor/v7pushaction/setup_deployment_strategy_for_push_plan_test.go index 238dc007729..5d0d8df0aba 100644 --- a/actor/v7pushaction/setup_deployment_strategy_for_push_plan_test.go +++ b/actor/v7pushaction/setup_deployment_strategy_for_push_plan_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go b/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go index d2866b08247..f06eeb6d76c 100644 --- a/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go +++ b/actor/v7pushaction/setup_droplet_path_for_push_plan_test.go @@ -3,7 +3,7 @@ package v7pushaction_test import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_no_start_for_push_plan_test.go b/actor/v7pushaction/setup_no_start_for_push_plan_test.go index 19902e9aa10..fa24192cc6d 100644 --- a/actor/v7pushaction/setup_no_start_for_push_plan_test.go +++ b/actor/v7pushaction/setup_no_start_for_push_plan_test.go @@ -3,7 +3,7 @@ package v7pushaction_test import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_no_wait_for_push_plan_test.go b/actor/v7pushaction/setup_no_wait_for_push_plan_test.go index e0f5b3ad62c..3e89800bb1c 100644 --- a/actor/v7pushaction/setup_no_wait_for_push_plan_test.go +++ b/actor/v7pushaction/setup_no_wait_for_push_plan_test.go @@ -3,7 +3,7 @@ package v7pushaction_test import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/setup_task_app_for_push_plan_test.go b/actor/v7pushaction/setup_task_app_for_push_plan_test.go index 988a206c13a..17a1bd3ab69 100644 --- a/actor/v7pushaction/setup_task_app_for_push_plan_test.go +++ b/actor/v7pushaction/setup_task_app_for_push_plan_test.go @@ -3,7 +3,7 @@ package v7pushaction_test import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/stage_package_for_application_test.go b/actor/v7pushaction/stage_package_for_application_test.go index b0a5154380c..cfe6a90051e 100644 --- a/actor/v7pushaction/stage_package_for_application_test.go +++ b/actor/v7pushaction/stage_package_for_application_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/stop_application_test.go b/actor/v7pushaction/stop_application_test.go index e380b43d9dd..04287023c20 100644 --- a/actor/v7pushaction/stop_application_test.go +++ b/actor/v7pushaction/stop_application_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/v7pushaction/v7pushaction_suite_test.go b/actor/v7pushaction/v7pushaction_suite_test.go index 8a41f84bf3a..9d503fc13d7 100644 --- a/actor/v7pushaction/v7pushaction_suite_test.go +++ b/actor/v7pushaction/v7pushaction_suite_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/actor/v7pushaction" "code.cloudfoundry.org/cli/actor/v7pushaction/v7pushactionfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/actor/versioncheck/minimum_version_check_test.go b/actor/versioncheck/minimum_version_check_test.go index f2a3a8f0bc6..89015dbe129 100644 --- a/actor/versioncheck/minimum_version_check_test.go +++ b/actor/versioncheck/minimum_version_check_test.go @@ -3,7 +3,7 @@ package versioncheck_test import ( . "code.cloudfoundry.org/cli/actor/versioncheck" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/actor/versioncheck/versioncheck_suite_test.go b/actor/versioncheck/versioncheck_suite_test.go index 87e59420d36..d85639d4fff 100644 --- a/actor/versioncheck/versioncheck_suite_test.go +++ b/actor/versioncheck/versioncheck_suite_test.go @@ -3,7 +3,7 @@ package versioncheck_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/ccerror_suite_test.go b/api/cloudcontroller/ccerror/ccerror_suite_test.go index 83106177c66..797f0f70c42 100644 --- a/api/cloudcontroller/ccerror/ccerror_suite_test.go +++ b/api/cloudcontroller/ccerror/ccerror_suite_test.go @@ -1,7 +1,7 @@ package ccerror_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/api/cloudcontroller/ccerror/multi_error_test.go b/api/cloudcontroller/ccerror/multi_error_test.go index 3f47bff273d..8b78993bda4 100644 --- a/api/cloudcontroller/ccerror/multi_error_test.go +++ b/api/cloudcontroller/ccerror/multi_error_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go b/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go index bba9e873428..1bcfe10cc7a 100644 --- a/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go +++ b/api/cloudcontroller/ccerror/service_offering_name_ambiguity_error_test.go @@ -2,7 +2,7 @@ package ccerror_test import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go b/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go index d6364d723f8..161c2c0bf9e 100644 --- a/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go +++ b/api/cloudcontroller/ccerror/service_offering_not_found_error_test.go @@ -2,7 +2,7 @@ package ccerror_test import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go b/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go index afdaab8fef8..024d896fe13 100644 --- a/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go +++ b/api/cloudcontroller/ccerror/v2_unexpected_response_error_test.go @@ -3,7 +3,7 @@ package ccerror_test import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go b/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go index a5c8811693e..0a265e85f33 100644 --- a/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go +++ b/api/cloudcontroller/ccerror/v3_unexpected_response_error_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv2/application_instance_status_test.go b/api/cloudcontroller/ccv2/application_instance_status_test.go index b58a2c8068a..27253cf1df1 100644 --- a/api/cloudcontroller/ccv2/application_instance_status_test.go +++ b/api/cloudcontroller/ccv2/application_instance_status_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/application_instance_test.go b/api/cloudcontroller/ccv2/application_instance_test.go index d651cb86af3..a22c62e82da 100644 --- a/api/cloudcontroller/ccv2/application_instance_test.go +++ b/api/cloudcontroller/ccv2/application_instance_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/application_test.go b/api/cloudcontroller/ccv2/application_test.go index c0fe6e8ffef..f5048b8505a 100644 --- a/api/cloudcontroller/ccv2/application_test.go +++ b/api/cloudcontroller/ccv2/application_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/buildpack_test.go b/api/cloudcontroller/ccv2/buildpack_test.go index a26875f3aa6..3b50312f790 100644 --- a/api/cloudcontroller/ccv2/buildpack_test.go +++ b/api/cloudcontroller/ccv2/buildpack_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/client_test.go b/api/cloudcontroller/ccv2/client_test.go index 005ee5ff461..61efc77d463 100644 --- a/api/cloudcontroller/ccv2/client_test.go +++ b/api/cloudcontroller/ccv2/client_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/ccv2fakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/cloudcontrollerv2_suite_test.go b/api/cloudcontroller/ccv2/cloudcontrollerv2_suite_test.go index d9039488257..b05299a60c8 100644 --- a/api/cloudcontroller/ccv2/cloudcontrollerv2_suite_test.go +++ b/api/cloudcontroller/ccv2/cloudcontrollerv2_suite_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/domain_test.go b/api/cloudcontroller/ccv2/domain_test.go index 42b617f2f2a..ed31140e4e2 100644 --- a/api/cloudcontroller/ccv2/domain_test.go +++ b/api/cloudcontroller/ccv2/domain_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/errors_test.go b/api/cloudcontroller/ccv2/errors_test.go index 237fc045be2..1cde849fc30 100644 --- a/api/cloudcontroller/ccv2/errors_test.go +++ b/api/cloudcontroller/ccv2/errors_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/event_test.go b/api/cloudcontroller/ccv2/event_test.go index 8d5c8ca0d68..43d9d16a6d6 100644 --- a/api/cloudcontroller/ccv2/event_test.go +++ b/api/cloudcontroller/ccv2/event_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/feature_flag_test.go b/api/cloudcontroller/ccv2/feature_flag_test.go index 56aac3b8438..389c56b1bb7 100644 --- a/api/cloudcontroller/ccv2/feature_flag_test.go +++ b/api/cloudcontroller/ccv2/feature_flag_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/info_test.go b/api/cloudcontroller/ccv2/info_test.go index 1a6231f3857..0345675f61a 100644 --- a/api/cloudcontroller/ccv2/info_test.go +++ b/api/cloudcontroller/ccv2/info_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/job_test.go b/api/cloudcontroller/ccv2/job_test.go index 03ee27c2aa2..21321e58790 100644 --- a/api/cloudcontroller/ccv2/job_test.go +++ b/api/cloudcontroller/ccv2/job_test.go @@ -18,8 +18,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/ccv2fakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/organization_quota_test.go b/api/cloudcontroller/ccv2/organization_quota_test.go index 80de4f355a8..eb5a72d970c 100644 --- a/api/cloudcontroller/ccv2/organization_quota_test.go +++ b/api/cloudcontroller/ccv2/organization_quota_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/organization_test.go b/api/cloudcontroller/ccv2/organization_test.go index ccf213a9905..02f3974f37f 100644 --- a/api/cloudcontroller/ccv2/organization_test.go +++ b/api/cloudcontroller/ccv2/organization_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/paginated_resources_test.go b/api/cloudcontroller/ccv2/paginated_resources_test.go index e0d70caa4e5..cc887fc0303 100644 --- a/api/cloudcontroller/ccv2/paginated_resources_test.go +++ b/api/cloudcontroller/ccv2/paginated_resources_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv2/resource_test.go b/api/cloudcontroller/ccv2/resource_test.go index 2b58128f23c..b495e59a163 100644 --- a/api/cloudcontroller/ccv2/resource_test.go +++ b/api/cloudcontroller/ccv2/resource_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/route_mapping_test.go b/api/cloudcontroller/ccv2/route_mapping_test.go index 2733339db11..e41abb23df4 100644 --- a/api/cloudcontroller/ccv2/route_mapping_test.go +++ b/api/cloudcontroller/ccv2/route_mapping_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/route_test.go b/api/cloudcontroller/ccv2/route_test.go index f0d835a2777..ca4db49bc0f 100644 --- a/api/cloudcontroller/ccv2/route_test.go +++ b/api/cloudcontroller/ccv2/route_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/security_group_test.go b/api/cloudcontroller/ccv2/security_group_test.go index f62dc7a8340..b597bf9162a 100644 --- a/api/cloudcontroller/ccv2/security_group_test.go +++ b/api/cloudcontroller/ccv2/security_group_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_binding_test.go b/api/cloudcontroller/ccv2/service_binding_test.go index 121c41d83f1..0af871faeec 100644 --- a/api/cloudcontroller/ccv2/service_binding_test.go +++ b/api/cloudcontroller/ccv2/service_binding_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_broker_test.go b/api/cloudcontroller/ccv2/service_broker_test.go index d9757c35b4e..c2f45e9612f 100644 --- a/api/cloudcontroller/ccv2/service_broker_test.go +++ b/api/cloudcontroller/ccv2/service_broker_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_instance_shared_from_test.go b/api/cloudcontroller/ccv2/service_instance_shared_from_test.go index 45905a8d431..3ed5f0bd3be 100644 --- a/api/cloudcontroller/ccv2/service_instance_shared_from_test.go +++ b/api/cloudcontroller/ccv2/service_instance_shared_from_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_instance_shared_to_test.go b/api/cloudcontroller/ccv2/service_instance_shared_to_test.go index f51cc5aba39..f11eb8c8ba1 100644 --- a/api/cloudcontroller/ccv2/service_instance_shared_to_test.go +++ b/api/cloudcontroller/ccv2/service_instance_shared_to_test.go @@ -4,7 +4,7 @@ import ( "net/http" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_instance_test.go b/api/cloudcontroller/ccv2/service_instance_test.go index 55fd4d70ef4..2c331871c72 100644 --- a/api/cloudcontroller/ccv2/service_instance_test.go +++ b/api/cloudcontroller/ccv2/service_instance_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_instance_user_provided_test.go b/api/cloudcontroller/ccv2/service_instance_user_provided_test.go index ddfc71aeae9..0183078d053 100644 --- a/api/cloudcontroller/ccv2/service_instance_user_provided_test.go +++ b/api/cloudcontroller/ccv2/service_instance_user_provided_test.go @@ -7,8 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_key_test.go b/api/cloudcontroller/ccv2/service_key_test.go index 62b97890ca8..fcffe2240fd 100644 --- a/api/cloudcontroller/ccv2/service_key_test.go +++ b/api/cloudcontroller/ccv2/service_key_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv2/service_plan_test.go b/api/cloudcontroller/ccv2/service_plan_test.go index ce6747b8e4b..32470b56f9b 100644 --- a/api/cloudcontroller/ccv2/service_plan_test.go +++ b/api/cloudcontroller/ccv2/service_plan_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_plan_visibility_test.go b/api/cloudcontroller/ccv2/service_plan_visibility_test.go index 5d92769a82a..c214c6d512d 100644 --- a/api/cloudcontroller/ccv2/service_plan_visibility_test.go +++ b/api/cloudcontroller/ccv2/service_plan_visibility_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/service_test.go b/api/cloudcontroller/ccv2/service_test.go index dc6e945fd08..fd858736f5d 100644 --- a/api/cloudcontroller/ccv2/service_test.go +++ b/api/cloudcontroller/ccv2/service_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/space_quota_test.go b/api/cloudcontroller/ccv2/space_quota_test.go index 509ab9460e8..d0b178b3ad8 100644 --- a/api/cloudcontroller/ccv2/space_quota_test.go +++ b/api/cloudcontroller/ccv2/space_quota_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/space_summary_test.go b/api/cloudcontroller/ccv2/space_summary_test.go index ac4cccf6106..9aa2436c494 100644 --- a/api/cloudcontroller/ccv2/space_summary_test.go +++ b/api/cloudcontroller/ccv2/space_summary_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/space_test.go b/api/cloudcontroller/ccv2/space_test.go index 25f83d47307..36943074466 100644 --- a/api/cloudcontroller/ccv2/space_test.go +++ b/api/cloudcontroller/ccv2/space_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/stack_test.go b/api/cloudcontroller/ccv2/stack_test.go index a377fb463d3..32dc0e45fe3 100644 --- a/api/cloudcontroller/ccv2/stack_test.go +++ b/api/cloudcontroller/ccv2/stack_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/target_test.go b/api/cloudcontroller/ccv2/target_test.go index ca764fa740f..e3f34dc112a 100644 --- a/api/cloudcontroller/ccv2/target_test.go +++ b/api/cloudcontroller/ccv2/target_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/ccv2fakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv2/user_test.go b/api/cloudcontroller/ccv2/user_test.go index 0037139afe6..f3524c1392d 100644 --- a/api/cloudcontroller/ccv2/user_test.go +++ b/api/cloudcontroller/ccv2/user_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/application_feature_test.go b/api/cloudcontroller/ccv3/application_feature_test.go index e60d2192322..2b0567169ec 100644 --- a/api/cloudcontroller/ccv3/application_feature_test.go +++ b/api/cloudcontroller/ccv3/application_feature_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/application_test.go b/api/cloudcontroller/ccv3/application_test.go index 2e1ec880ffd..97426b92f26 100644 --- a/api/cloudcontroller/ccv3/application_test.go +++ b/api/cloudcontroller/ccv3/application_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/build_test.go b/api/cloudcontroller/ccv3/build_test.go index 2a2236c5ff3..c1f9cd0a70d 100644 --- a/api/cloudcontroller/ccv3/build_test.go +++ b/api/cloudcontroller/ccv3/build_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/buildpack_test.go b/api/cloudcontroller/ccv3/buildpack_test.go index 5445d359413..11ffa9645f0 100644 --- a/api/cloudcontroller/ccv3/buildpack_test.go +++ b/api/cloudcontroller/ccv3/buildpack_test.go @@ -19,7 +19,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" . "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/ccv3_suite_test.go b/api/cloudcontroller/ccv3/ccv3_suite_test.go index 9648ee88b33..6073e04d7ce 100644 --- a/api/cloudcontroller/ccv3/ccv3_suite_test.go +++ b/api/cloudcontroller/ccv3/ccv3_suite_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/client_test.go b/api/cloudcontroller/ccv3/client_test.go index 9d55572dbc4..31a0d2e8da8 100644 --- a/api/cloudcontroller/ccv3/client_test.go +++ b/api/cloudcontroller/ccv3/client_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/deployment_test.go b/api/cloudcontroller/ccv3/deployment_test.go index 4c4e6c162d4..56f336b1437 100644 --- a/api/cloudcontroller/ccv3/deployment_test.go +++ b/api/cloudcontroller/ccv3/deployment_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/resources" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/domain_test.go b/api/cloudcontroller/ccv3/domain_test.go index 29bf6e6397f..df3dbf5b599 100644 --- a/api/cloudcontroller/ccv3/domain_test.go +++ b/api/cloudcontroller/ccv3/domain_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/types" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/droplet_test.go b/api/cloudcontroller/ccv3/droplet_test.go index 6c4ce7bd634..6a693d6d3fd 100644 --- a/api/cloudcontroller/ccv3/droplet_test.go +++ b/api/cloudcontroller/ccv3/droplet_test.go @@ -17,7 +17,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/environment_test.go b/api/cloudcontroller/ccv3/environment_test.go index d4bfcf9dfaf..14b8462218d 100644 --- a/api/cloudcontroller/ccv3/environment_test.go +++ b/api/cloudcontroller/ccv3/environment_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/environment_variables_test.go b/api/cloudcontroller/ccv3/environment_variables_test.go index 4735e641eb0..f2ce0794bd5 100644 --- a/api/cloudcontroller/ccv3/environment_variables_test.go +++ b/api/cloudcontroller/ccv3/environment_variables_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/errors_test.go b/api/cloudcontroller/ccv3/errors_test.go index 0c6a71645b2..48f2b9ca9b5 100644 --- a/api/cloudcontroller/ccv3/errors_test.go +++ b/api/cloudcontroller/ccv3/errors_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/event_test.go b/api/cloudcontroller/ccv3/event_test.go index 0f353910a86..b584bba228d 100644 --- a/api/cloudcontroller/ccv3/event_test.go +++ b/api/cloudcontroller/ccv3/event_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/feature_flag_test.go b/api/cloudcontroller/ccv3/feature_flag_test.go index a8c8aa1d113..ceeb15cf222 100644 --- a/api/cloudcontroller/ccv3/feature_flag_test.go +++ b/api/cloudcontroller/ccv3/feature_flag_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/info_test.go b/api/cloudcontroller/ccv3/info_test.go index 4a6fc5ca4b2..6247074ef80 100644 --- a/api/cloudcontroller/ccv3/info_test.go +++ b/api/cloudcontroller/ccv3/info_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/internal/internal_suite_test.go b/api/cloudcontroller/ccv3/internal/internal_suite_test.go index 7f6b68763e8..a43364c4c30 100644 --- a/api/cloudcontroller/ccv3/internal/internal_suite_test.go +++ b/api/cloudcontroller/ccv3/internal/internal_suite_test.go @@ -1,7 +1,7 @@ package internal_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/api/cloudcontroller/ccv3/internal/routing_test.go b/api/cloudcontroller/ccv3/internal/routing_test.go index afaa396d88a..3c42922d81d 100644 --- a/api/cloudcontroller/ccv3/internal/routing_test.go +++ b/api/cloudcontroller/ccv3/internal/routing_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/isolation_segment_test.go b/api/cloudcontroller/ccv3/isolation_segment_test.go index 79026d78689..a52e3d1344c 100644 --- a/api/cloudcontroller/ccv3/isolation_segment_test.go +++ b/api/cloudcontroller/ccv3/isolation_segment_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/job_test.go b/api/cloudcontroller/ccv3/job_test.go index da08b5e7c61..8047b7cf4fc 100644 --- a/api/cloudcontroller/ccv3/job_test.go +++ b/api/cloudcontroller/ccv3/job_test.go @@ -9,8 +9,8 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/job_url_test.go b/api/cloudcontroller/ccv3/job_url_test.go index e9fd42e3fd4..3c6d3bd6219 100644 --- a/api/cloudcontroller/ccv3/job_url_test.go +++ b/api/cloudcontroller/ccv3/job_url_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/manifest_test.go b/api/cloudcontroller/ccv3/manifest_test.go index 3c3ea71e0b6..56c1382a40f 100644 --- a/api/cloudcontroller/ccv3/manifest_test.go +++ b/api/cloudcontroller/ccv3/manifest_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/metadata_test.go b/api/cloudcontroller/ccv3/metadata_test.go index a40f3461d38..a5f624fe4a1 100644 --- a/api/cloudcontroller/ccv3/metadata_test.go +++ b/api/cloudcontroller/ccv3/metadata_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" . "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/organization_quota_test.go b/api/cloudcontroller/ccv3/organization_quota_test.go index 9d509d62a9f..ea3ad72ca36 100644 --- a/api/cloudcontroller/ccv3/organization_quota_test.go +++ b/api/cloudcontroller/ccv3/organization_quota_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/organization_test.go b/api/cloudcontroller/ccv3/organization_test.go index dcdab99d486..b5b9150b47d 100644 --- a/api/cloudcontroller/ccv3/organization_test.go +++ b/api/cloudcontroller/ccv3/organization_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/resources" . "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/package_test.go b/api/cloudcontroller/ccv3/package_test.go index ab1d7797765..2ef64f230c0 100644 --- a/api/cloudcontroller/ccv3/package_test.go +++ b/api/cloudcontroller/ccv3/package_test.go @@ -19,7 +19,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/ccv3/paginated_resources_test.go b/api/cloudcontroller/ccv3/paginated_resources_test.go index 79088eb95d2..debe0ad1626 100644 --- a/api/cloudcontroller/ccv3/paginated_resources_test.go +++ b/api/cloudcontroller/ccv3/paginated_resources_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" . "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/process_instance_test.go b/api/cloudcontroller/ccv3/process_instance_test.go index a92935a8da3..5eee667fdad 100644 --- a/api/cloudcontroller/ccv3/process_instance_test.go +++ b/api/cloudcontroller/ccv3/process_instance_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/process_test.go b/api/cloudcontroller/ccv3/process_test.go index 2502c8e57a1..140b621b1c0 100644 --- a/api/cloudcontroller/ccv3/process_test.go +++ b/api/cloudcontroller/ccv3/process_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" . "github.com/onsi/gomega/gstruct" diff --git a/api/cloudcontroller/ccv3/query_test.go b/api/cloudcontroller/ccv3/query_test.go index 35e1928bffa..e614d4c8195 100644 --- a/api/cloudcontroller/ccv3/query_test.go +++ b/api/cloudcontroller/ccv3/query_test.go @@ -4,7 +4,7 @@ import ( "net/url" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/relationship_list_test.go b/api/cloudcontroller/ccv3/relationship_list_test.go index 883cb2ad250..ebb5c22b283 100644 --- a/api/cloudcontroller/ccv3/relationship_list_test.go +++ b/api/cloudcontroller/ccv3/relationship_list_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/relationship_test.go b/api/cloudcontroller/ccv3/relationship_test.go index ba396d00eec..c0d432a1c50 100644 --- a/api/cloudcontroller/ccv3/relationship_test.go +++ b/api/cloudcontroller/ccv3/relationship_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/requester_test.go b/api/cloudcontroller/ccv3/requester_test.go index 3f164255252..bb4d4f4910c 100644 --- a/api/cloudcontroller/ccv3/requester_test.go +++ b/api/cloudcontroller/ccv3/requester_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/resources" . "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/resource_test.go b/api/cloudcontroller/ccv3/resource_test.go index d1044017723..0b47d31fb0a 100644 --- a/api/cloudcontroller/ccv3/resource_test.go +++ b/api/cloudcontroller/ccv3/resource_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/revisions_test.go b/api/cloudcontroller/ccv3/revisions_test.go index 34f6b01b53b..fe3ac699ea2 100644 --- a/api/cloudcontroller/ccv3/revisions_test.go +++ b/api/cloudcontroller/ccv3/revisions_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/role_test.go b/api/cloudcontroller/ccv3/role_test.go index befcb7fcf71..50a226da1b8 100644 --- a/api/cloudcontroller/ccv3/role_test.go +++ b/api/cloudcontroller/ccv3/role_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/route_test.go b/api/cloudcontroller/ccv3/route_test.go index 3cd7fe36eca..041ad870d1f 100644 --- a/api/cloudcontroller/ccv3/route_test.go +++ b/api/cloudcontroller/ccv3/route_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/security_group_test.go b/api/cloudcontroller/ccv3/security_group_test.go index 7a52af4047b..b2a1e915aea 100644 --- a/api/cloudcontroller/ccv3/security_group_test.go +++ b/api/cloudcontroller/ccv3/security_group_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/ccv3/service_broker_test.go b/api/cloudcontroller/ccv3/service_broker_test.go index dcfd66ac329..ab4ea030bdd 100644 --- a/api/cloudcontroller/ccv3/service_broker_test.go +++ b/api/cloudcontroller/ccv3/service_broker_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/service_instance_test.go b/api/cloudcontroller/ccv3/service_instance_test.go index 1219e3c5256..1b1e1f4f827 100644 --- a/api/cloudcontroller/ccv3/service_instance_test.go +++ b/api/cloudcontroller/ccv3/service_instance_test.go @@ -8,8 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/service_offering_test.go b/api/cloudcontroller/ccv3/service_offering_test.go index bac8d403d65..0e3d898951a 100644 --- a/api/cloudcontroller/ccv3/service_offering_test.go +++ b/api/cloudcontroller/ccv3/service_offering_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/internal" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" . "github.com/onsi/gomega/gstruct" diff --git a/api/cloudcontroller/ccv3/service_plan_test.go b/api/cloudcontroller/ccv3/service_plan_test.go index b36952b54d2..c8db9f1cab2 100644 --- a/api/cloudcontroller/ccv3/service_plan_test.go +++ b/api/cloudcontroller/ccv3/service_plan_test.go @@ -8,8 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/service_plan_visibility_test.go b/api/cloudcontroller/ccv3/service_plan_visibility_test.go index 078ed20a2c5..d5d0c7a136d 100644 --- a/api/cloudcontroller/ccv3/service_plan_visibility_test.go +++ b/api/cloudcontroller/ccv3/service_plan_visibility_test.go @@ -7,8 +7,8 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/sidecar_test.go b/api/cloudcontroller/ccv3/sidecar_test.go index 6a963ed4cd7..744bb8db77e 100644 --- a/api/cloudcontroller/ccv3/sidecar_test.go +++ b/api/cloudcontroller/ccv3/sidecar_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" . "github.com/onsi/gomega/gstruct" diff --git a/api/cloudcontroller/ccv3/space_feature_test.go b/api/cloudcontroller/ccv3/space_feature_test.go index 45e97d398fd..d3aea454d72 100644 --- a/api/cloudcontroller/ccv3/space_feature_test.go +++ b/api/cloudcontroller/ccv3/space_feature_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/space_quota_test.go b/api/cloudcontroller/ccv3/space_quota_test.go index 26ba72d6126..92a91e238b0 100644 --- a/api/cloudcontroller/ccv3/space_quota_test.go +++ b/api/cloudcontroller/ccv3/space_quota_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/space_test.go b/api/cloudcontroller/ccv3/space_test.go index c5786ae04f9..2f5313e1f69 100644 --- a/api/cloudcontroller/ccv3/space_test.go +++ b/api/cloudcontroller/ccv3/space_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/resources" . "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/stack_test.go b/api/cloudcontroller/ccv3/stack_test.go index 7dc60174cb2..8ad2225db6e 100644 --- a/api/cloudcontroller/ccv3/stack_test.go +++ b/api/cloudcontroller/ccv3/stack_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/target_test.go b/api/cloudcontroller/ccv3/target_test.go index 98df45b9422..7038e8170bf 100644 --- a/api/cloudcontroller/ccv3/target_test.go +++ b/api/cloudcontroller/ccv3/target_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/ccv3fakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/task_test.go b/api/cloudcontroller/ccv3/task_test.go index e820eae19ed..c45c4d4b7a3 100644 --- a/api/cloudcontroller/ccv3/task_test.go +++ b/api/cloudcontroller/ccv3/task_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/user_test.go b/api/cloudcontroller/ccv3/user_test.go index 4331634e6d6..5edc364d1e2 100644 --- a/api/cloudcontroller/ccv3/user_test.go +++ b/api/cloudcontroller/ccv3/user_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/ccv3/v2_formatted_resource_test.go b/api/cloudcontroller/ccv3/v2_formatted_resource_test.go index 8a5b605c697..6f4083b5041 100644 --- a/api/cloudcontroller/ccv3/v2_formatted_resource_test.go +++ b/api/cloudcontroller/ccv3/v2_formatted_resource_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" . "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/cloud_controller_connection_test.go b/api/cloudcontroller/cloud_controller_connection_test.go index 747d6ff71f9..b32124f5ce7 100644 --- a/api/cloudcontroller/cloud_controller_connection_test.go +++ b/api/cloudcontroller/cloud_controller_connection_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller" "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/cloudcontroller/cloudcontroller_suite_test.go b/api/cloudcontroller/cloudcontroller_suite_test.go index e3e4b4577c6..ce6355befaa 100644 --- a/api/cloudcontroller/cloudcontroller_suite_test.go +++ b/api/cloudcontroller/cloudcontroller_suite_test.go @@ -4,7 +4,7 @@ import ( "bytes" "log" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/cloudcontroller/wrapper/request_logger_test.go b/api/cloudcontroller/wrapper/request_logger_test.go index 920d72716f2..93d64c7bd34 100644 --- a/api/cloudcontroller/wrapper/request_logger_test.go +++ b/api/cloudcontroller/wrapper/request_logger_test.go @@ -13,7 +13,7 @@ import ( . "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper/wrapperfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/wrapper/retry_request_test.go b/api/cloudcontroller/wrapper/retry_request_test.go index 0fe277d490b..69e0a56d4e2 100644 --- a/api/cloudcontroller/wrapper/retry_request_test.go +++ b/api/cloudcontroller/wrapper/retry_request_test.go @@ -10,8 +10,8 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccerror" "code.cloudfoundry.org/cli/api/cloudcontroller/cloudcontrollerfakes" . "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/wrapper/uaa_authentication_test.go b/api/cloudcontroller/wrapper/uaa_authentication_test.go index 7e4a6a7c732..650979ffd3d 100644 --- a/api/cloudcontroller/wrapper/uaa_authentication_test.go +++ b/api/cloudcontroller/wrapper/uaa_authentication_test.go @@ -20,7 +20,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/wrapper/wrapperfakes" "code.cloudfoundry.org/cli/api/uaa/wrapper/util" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/cloudcontroller/wrapper/wrapper_suite_test.go b/api/cloudcontroller/wrapper/wrapper_suite_test.go index f0ca6eeda02..b93bd0b3d8f 100644 --- a/api/cloudcontroller/wrapper/wrapper_suite_test.go +++ b/api/cloudcontroller/wrapper/wrapper_suite_test.go @@ -4,7 +4,7 @@ import ( "bytes" "log" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/client_test.go b/api/plugin/client_test.go index 8d7a37b1ab0..4a3275201ee 100644 --- a/api/plugin/client_test.go +++ b/api/plugin/client_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/plugin" "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/plugin/download_plugin_test.go b/api/plugin/download_plugin_test.go index 9f53aea4bfe..be153b71561 100644 --- a/api/plugin/download_plugin_test.go +++ b/api/plugin/download_plugin_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/api/plugin" "code.cloudfoundry.org/cli/api/plugin/pluginerror" "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/plugin/plugin_connection_test.go b/api/plugin/plugin_connection_test.go index 5e1a2fd12b6..f1bf9af3482 100644 --- a/api/plugin/plugin_connection_test.go +++ b/api/plugin/plugin_connection_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/api/plugin" "code.cloudfoundry.org/cli/api/plugin/pluginerror" "code.cloudfoundry.org/cli/api/plugin/pluginfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/plugin/plugin_repository_test.go b/api/plugin/plugin_repository_test.go index f0e187f14ca..d929b9a2a9d 100644 --- a/api/plugin/plugin_repository_test.go +++ b/api/plugin/plugin_repository_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/api/plugin" "code.cloudfoundry.org/cli/api/plugin/pluginerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/plugin/plugin_suite_test.go b/api/plugin/plugin_suite_test.go index b514244a53a..e188e117a93 100644 --- a/api/plugin/plugin_suite_test.go +++ b/api/plugin/plugin_suite_test.go @@ -5,7 +5,7 @@ import ( "log" . "code.cloudfoundry.org/cli/api/plugin" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/plugin/wrapper/request_logger_test.go b/api/plugin/wrapper/request_logger_test.go index 377723ab538..1a7c4b75a11 100644 --- a/api/plugin/wrapper/request_logger_test.go +++ b/api/plugin/wrapper/request_logger_test.go @@ -14,7 +14,7 @@ import ( . "code.cloudfoundry.org/cli/api/plugin/wrapper" "code.cloudfoundry.org/cli/api/plugin/wrapper/wrapperfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/plugin/wrapper/retry_request_test.go b/api/plugin/wrapper/retry_request_test.go index dcd97918f58..6598f2f2a85 100644 --- a/api/plugin/wrapper/retry_request_test.go +++ b/api/plugin/wrapper/retry_request_test.go @@ -10,8 +10,8 @@ import ( "code.cloudfoundry.org/cli/api/plugin/pluginerror" "code.cloudfoundry.org/cli/api/plugin/pluginfakes" . "code.cloudfoundry.org/cli/api/plugin/wrapper" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/plugin/wrapper/wrapper_suite_test.go b/api/plugin/wrapper/wrapper_suite_test.go index 9ff807b77f8..8e4a829554f 100644 --- a/api/plugin/wrapper/wrapper_suite_test.go +++ b/api/plugin/wrapper/wrapper_suite_test.go @@ -4,7 +4,7 @@ import ( "bytes" "log" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/router/router_group_test.go b/api/router/router_group_test.go index 78d60b4b910..461d183cf54 100644 --- a/api/router/router_group_test.go +++ b/api/router/router_group_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/api/router" "code.cloudfoundry.org/cli/api/router/routererror" "code.cloudfoundry.org/cli/api/router/wrapper" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/router/router_suite_test.go b/api/router/router_suite_test.go index d059eb5813d..17ef20c2851 100644 --- a/api/router/router_suite_test.go +++ b/api/router/router_suite_test.go @@ -6,7 +6,7 @@ import ( "net/url" "code.cloudfoundry.org/cli/api/router" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/api/router/wrapper/error_wrapper_test.go b/api/router/wrapper/error_wrapper_test.go index de75d125ff0..e5b57115d18 100644 --- a/api/router/wrapper/error_wrapper_test.go +++ b/api/router/wrapper/error_wrapper_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/router/routererror" "code.cloudfoundry.org/cli/api/router/routerfakes" . "code.cloudfoundry.org/cli/api/router/wrapper" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/router/wrapper/request_logger_test.go b/api/router/wrapper/request_logger_test.go index 3f7394e6ee7..38327611e3f 100644 --- a/api/router/wrapper/request_logger_test.go +++ b/api/router/wrapper/request_logger_test.go @@ -13,7 +13,7 @@ import ( . "code.cloudfoundry.org/cli/api/router/wrapper" "code.cloudfoundry.org/cli/api/router/wrapper/wrapperfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/router/wrapper/uaa_authentication_test.go b/api/router/wrapper/uaa_authentication_test.go index 86788c337df..fc15f3a5dbb 100644 --- a/api/router/wrapper/uaa_authentication_test.go +++ b/api/router/wrapper/uaa_authentication_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/wrapper/util" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/router/wrapper/wrapper_suite_test.go b/api/router/wrapper/wrapper_suite_test.go index a0aaff50b6b..ce086767016 100644 --- a/api/router/wrapper/wrapper_suite_test.go +++ b/api/router/wrapper/wrapper_suite_test.go @@ -3,7 +3,7 @@ package wrapper import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/auth_test.go b/api/uaa/auth_test.go index 0ad61712cae..16d3d28bae4 100644 --- a/api/uaa/auth_test.go +++ b/api/uaa/auth_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/constant" "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/uaa/client_test.go b/api/uaa/client_test.go index b8dceb2cfcd..e9186242ac5 100644 --- a/api/uaa/client_test.go +++ b/api/uaa/client_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/uaa/error_converter_test.go b/api/uaa/error_converter_test.go index 16ccaca085f..8d8a03432d9 100644 --- a/api/uaa/error_converter_test.go +++ b/api/uaa/error_converter_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/info_test.go b/api/uaa/info_test.go index 0471a5beb66..2741bb22682 100644 --- a/api/uaa/info_test.go +++ b/api/uaa/info_test.go @@ -3,7 +3,7 @@ package uaa_test import ( . "code.cloudfoundry.org/cli/api/uaa" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/internal/internal_suite_test.go b/api/uaa/internal/internal_suite_test.go index f87ad622192..4c5515d385e 100644 --- a/api/uaa/internal/internal_suite_test.go +++ b/api/uaa/internal/internal_suite_test.go @@ -1,7 +1,7 @@ package internal_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/api/uaa/internal/routing_test.go b/api/uaa/internal/routing_test.go index ddad27b7d15..e808296c04a 100644 --- a/api/uaa/internal/routing_test.go +++ b/api/uaa/internal/routing_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa/internal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/noaabridge/noaabridge_suite_test.go b/api/uaa/noaabridge/noaabridge_suite_test.go index f94004666a4..6fd6362d87c 100644 --- a/api/uaa/noaabridge/noaabridge_suite_test.go +++ b/api/uaa/noaabridge/noaabridge_suite_test.go @@ -1,7 +1,7 @@ package noaabridge_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/api/uaa/noaabridge/token_refresher_test.go b/api/uaa/noaabridge/token_refresher_test.go index cdcb00eb6a2..b7bdf5fcee2 100644 --- a/api/uaa/noaabridge/token_refresher_test.go +++ b/api/uaa/noaabridge/token_refresher_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/uaa" . "code.cloudfoundry.org/cli/api/uaa/noaabridge" "code.cloudfoundry.org/cli/api/uaa/noaabridge/noaabridgefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/refresh_token_test.go b/api/uaa/refresh_token_test.go index 8a7d49448e2..9ad26e3d093 100644 --- a/api/uaa/refresh_token_test.go +++ b/api/uaa/refresh_token_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/api/uaa/constant" "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/uaa/resources_test.go b/api/uaa/resources_test.go index 925131c8acf..c08b2917976 100644 --- a/api/uaa/resources_test.go +++ b/api/uaa/resources_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/uaa/ssh_test.go b/api/uaa/ssh_test.go index 2e81e9c2c3f..94ff8071092 100644 --- a/api/uaa/ssh_test.go +++ b/api/uaa/ssh_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/uaa/uaa_connection_test.go b/api/uaa/uaa_connection_test.go index 129c72cc178..25009795a4f 100644 --- a/api/uaa/uaa_connection_test.go +++ b/api/uaa/uaa_connection_test.go @@ -6,7 +6,7 @@ import ( "runtime" . "code.cloudfoundry.org/cli/api/uaa" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/uaa/uaa_suite_test.go b/api/uaa/uaa_suite_test.go index 030832bba95..8383cb20f92 100644 --- a/api/uaa/uaa_suite_test.go +++ b/api/uaa/uaa_suite_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/uaa/user_test.go b/api/uaa/user_test.go index 96ac8e4a6ab..e86ade3a0cc 100644 --- a/api/uaa/user_test.go +++ b/api/uaa/user_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/actor/actionerror" . "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/uaafakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" ) diff --git a/api/uaa/wrapper/request_logger_test.go b/api/uaa/wrapper/request_logger_test.go index 553349704fc..57ba35041bc 100644 --- a/api/uaa/wrapper/request_logger_test.go +++ b/api/uaa/wrapper/request_logger_test.go @@ -14,7 +14,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa/wrapper" "code.cloudfoundry.org/cli/api/uaa/wrapper/wrapperfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/wrapper/retry_request_test.go b/api/uaa/wrapper/retry_request_test.go index 142dca860a9..f953f355c43 100644 --- a/api/uaa/wrapper/retry_request_test.go +++ b/api/uaa/wrapper/retry_request_test.go @@ -8,8 +8,8 @@ import ( "code.cloudfoundry.org/cli/api/uaa" "code.cloudfoundry.org/cli/api/uaa/uaafakes" . "code.cloudfoundry.org/cli/api/uaa/wrapper" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/wrapper/uaa_authentication_test.go b/api/uaa/wrapper/uaa_authentication_test.go index 63048f4d01e..6b3c3abe269 100644 --- a/api/uaa/wrapper/uaa_authentication_test.go +++ b/api/uaa/wrapper/uaa_authentication_test.go @@ -13,7 +13,7 @@ import ( . "code.cloudfoundry.org/cli/api/uaa/wrapper" "code.cloudfoundry.org/cli/api/uaa/wrapper/util" "code.cloudfoundry.org/cli/api/uaa/wrapper/wrapperfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/api/uaa/wrapper/wrapper_suite_test.go b/api/uaa/wrapper/wrapper_suite_test.go index 808ebf747a0..b74befb120a 100644 --- a/api/uaa/wrapper/wrapper_suite_test.go +++ b/api/uaa/wrapper/wrapper_suite_test.go @@ -4,7 +4,7 @@ import ( "bytes" "log" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/bin/test-integration b/bin/test-integration deleted file mode 100755 index e9737413059..00000000000 --- a/bin/test-integration +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -x -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -export CF_DIAL_TIMEOUT=15 - -$DIR/cleanup-integration - -ginkgo -r -randomizeAllSpecs -slowSpecThreshold=60 $@ integration/isolated integration/plugin integration/experimental - -if [[ -z $SKIP_OTHER ]]; then - # The following test suite **cannot** be run in parallel!!! - ginkgo -r -randomizeAllSpecs -slowSpecThreshold=60 integration/global -fi - -$DIR/cleanup-integration diff --git a/cf/actors/actors_suite_test.go b/cf/actors/actors_suite_test.go index ddedc64c6af..d40c9f87f64 100644 --- a/cf/actors/actors_suite_test.go +++ b/cf/actors/actors_suite_test.go @@ -3,7 +3,7 @@ package actors_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/actors/brokerbuilder/broker_builder_suite_test.go b/cf/actors/brokerbuilder/broker_builder_suite_test.go index c0bfffd9847..59afbdfa575 100644 --- a/cf/actors/brokerbuilder/broker_builder_suite_test.go +++ b/cf/actors/brokerbuilder/broker_builder_suite_test.go @@ -1,7 +1,7 @@ package brokerbuilder_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/actors/brokerbuilder/broker_builder_test.go b/cf/actors/brokerbuilder/broker_builder_test.go index 94590c76c43..8d009927325 100644 --- a/cf/actors/brokerbuilder/broker_builder_test.go +++ b/cf/actors/brokerbuilder/broker_builder_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/cf/actors/servicebuilder/servicebuilderfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/planbuilder/plan_builder_suite_test.go b/cf/actors/planbuilder/plan_builder_suite_test.go index f1f592be337..df13f1fd1f7 100644 --- a/cf/actors/planbuilder/plan_builder_suite_test.go +++ b/cf/actors/planbuilder/plan_builder_suite_test.go @@ -1,7 +1,7 @@ package planbuilder_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/actors/planbuilder/plan_builder_test.go b/cf/actors/planbuilder/plan_builder_test.go index bcb23d1e4cc..f49c1b6a1fa 100644 --- a/cf/actors/planbuilder/plan_builder_test.go +++ b/cf/actors/planbuilder/plan_builder_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/apifakes" "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/pluginrepo/plugin_repo.go b/cf/actors/pluginrepo/plugin_repo.go index ea5869d9afc..e7ac7ef6be9 100644 --- a/cf/actors/pluginrepo/plugin_repo.go +++ b/cf/actors/pluginrepo/plugin_repo.go @@ -1,14 +1,10 @@ package pluginrepo import ( - "code.cloudfoundry.org/cli/version" "encoding/json" "fmt" "io" "net/http" - "os" - "path/filepath" - "runtime" "strings" clipr "code.cloudfoundry.org/cli-plugin-repo/web" @@ -35,20 +31,15 @@ func (r pluginRepo) GetPlugins(repos []models.PluginRepo) (map[string][]clipr.Pl repoPlugins := make(map[string][]clipr.Plugin) for _, repo := range repos { + // resp, err := http.Get(getListEndpoint(repo.URL)) client := &http.Client{} req, err := http.NewRequest("GET", getListEndpoint(repo.URL), nil) if err != nil { - repoError = append(repoError, fmt.Sprintf(T("Error creating a request")+" '%s' - %s", repo.Name, err.Error())) + repoError = append(repoError, fmt.Sprintf(T("Error requesting from")+" '%s' - %s", repo.Name, err.Error())) continue } - userAgent := fmt.Sprintf("%s/%s (%s; %s %s)", - filepath.Base(os.Args[0]), - version.VersionString(), - runtime.Version(), - runtime.GOARCH, - runtime.GOOS, - ) - req.Header.Set("User-Agent", userAgent) + + req.Header.Set("User-Agent", "golang_user_agent/1.0") resp, err := client.Do(req) if err != nil { repoError = append(repoError, fmt.Sprintf(T("Error requesting from")+" '%s' - %s", repo.Name, err.Error())) diff --git a/cf/actors/pluginrepo/plugin_repo_suite_test.go b/cf/actors/pluginrepo/plugin_repo_suite_test.go index eb732390863..cbb56b8b877 100644 --- a/cf/actors/pluginrepo/plugin_repo_suite_test.go +++ b/cf/actors/pluginrepo/plugin_repo_suite_test.go @@ -3,7 +3,7 @@ package pluginrepo_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/actors/pluginrepo/plugin_repo_test.go b/cf/actors/pluginrepo/plugin_repo_test.go index 64883af1436..3247dd2800c 100644 --- a/cf/actors/pluginrepo/plugin_repo_test.go +++ b/cf/actors/pluginrepo/plugin_repo_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/push_test.go b/cf/actors/push_test.go index 33bd26b5961..205850e52cd 100644 --- a/cf/actors/push_test.go +++ b/cf/actors/push_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/appfiles" "code.cloudfoundry.org/cli/cf/appfiles/appfilesfakes" "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/routes_test.go b/cf/actors/routes_test.go index 2fbab050aa5..95176a5042e 100644 --- a/cf/actors/routes_test.go +++ b/cf/actors/routes_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/cf/errors/errorsfakes" "code.cloudfoundry.org/cli/cf/models" "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/servicebuilder/service_builder_suite_test.go b/cf/actors/servicebuilder/service_builder_suite_test.go index 185a9e94d48..d1adac89d61 100644 --- a/cf/actors/servicebuilder/service_builder_suite_test.go +++ b/cf/actors/servicebuilder/service_builder_suite_test.go @@ -1,7 +1,7 @@ package servicebuilder_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/actors/servicebuilder/service_builder_test.go b/cf/actors/servicebuilder/service_builder_test.go index 16b91c8f02b..380fcbb9b7d 100644 --- a/cf/actors/servicebuilder/service_builder_test.go +++ b/cf/actors/servicebuilder/service_builder_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/services_plans_test.go b/cf/actors/services_plans_test.go index 268494abd0e..ebd27048be2 100644 --- a/cf/actors/services_plans_test.go +++ b/cf/actors/services_plans_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/actors/services_test.go b/cf/actors/services_test.go index fc846c2e552..16e5891b340 100644 --- a/cf/actors/services_test.go +++ b/cf/actors/services_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/cf/errors" "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/api_suite_test.go b/cf/api/api_suite_test.go index 98ae9aee9ec..063a28603b2 100644 --- a/cf/api/api_suite_test.go +++ b/cf/api/api_suite_test.go @@ -3,7 +3,7 @@ package api_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/app_summary_test.go b/cf/api/app_summary_test.go index a376f1714a5..36f0b0e0d76 100644 --- a/cf/api/app_summary_test.go +++ b/cf/api/app_summary_test.go @@ -13,7 +13,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appevents/app_events_suite_test.go b/cf/api/appevents/app_events_suite_test.go index efc415dbde3..72faadddf92 100644 --- a/cf/api/appevents/app_events_suite_test.go +++ b/cf/api/appevents/app_events_suite_test.go @@ -3,7 +3,7 @@ package appevents_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/appevents/app_events_test.go b/cf/api/appevents/app_events_test.go index 2e6c4b28763..3edf21f9783 100644 --- a/cf/api/appevents/app_events_test.go +++ b/cf/api/appevents/app_events_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/cf/trace/tracefakes" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appfiles/app_files_suite_test.go b/cf/api/appfiles/app_files_suite_test.go index d4cbff6c4df..f1e204e4e19 100644 --- a/cf/api/appfiles/app_files_suite_test.go +++ b/cf/api/appfiles/app_files_suite_test.go @@ -3,7 +3,7 @@ package appfiles_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/appfiles/app_files_test.go b/cf/api/appfiles/app_files_test.go index f6f27f08d89..62f6484f2e0 100644 --- a/cf/api/appfiles/app_files_test.go +++ b/cf/api/appfiles/app_files_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/appfiles" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/appinstances/app_instances_suite_test.go b/cf/api/appinstances/app_instances_suite_test.go index aa0342e683f..dc833a081ce 100644 --- a/cf/api/appinstances/app_instances_suite_test.go +++ b/cf/api/appinstances/app_instances_suite_test.go @@ -3,7 +3,7 @@ package appinstances_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/appinstances/app_instances_test.go b/cf/api/appinstances/app_instances_test.go index b3223d37544..625a905edaf 100644 --- a/cf/api/appinstances/app_instances_test.go +++ b/cf/api/appinstances/app_instances_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/appinstances" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/applicationbits/application_bits_suite_test.go b/cf/api/applicationbits/application_bits_suite_test.go index 0182f4602c9..80506752f90 100644 --- a/cf/api/applicationbits/application_bits_suite_test.go +++ b/cf/api/applicationbits/application_bits_suite_test.go @@ -3,7 +3,7 @@ package applicationbits_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/applicationbits/application_bits_test.go b/cf/api/applicationbits/application_bits_test.go index 50805984eb6..0ee4183737d 100644 --- a/cf/api/applicationbits/application_bits_test.go +++ b/cf/api/applicationbits/application_bits_test.go @@ -23,7 +23,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/applicationbits" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/applications/applications_suite_test.go b/cf/api/applications/applications_suite_test.go index ec168a3a3b2..4fc00bc02a7 100644 --- a/cf/api/applications/applications_suite_test.go +++ b/cf/api/applications/applications_suite_test.go @@ -3,7 +3,7 @@ package applications_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/applications/applications_test.go b/cf/api/applications/applications_test.go index 64d5c3a5822..125da3522a9 100644 --- a/cf/api/applications/applications_test.go +++ b/cf/api/applications/applications_test.go @@ -21,7 +21,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/applications" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/authentication/authentication_suite_test.go b/cf/api/authentication/authentication_suite_test.go index 08310a8a382..1469b4e91b5 100644 --- a/cf/api/authentication/authentication_suite_test.go +++ b/cf/api/authentication/authentication_suite_test.go @@ -3,7 +3,7 @@ package authentication_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/authentication/authentication_test.go b/cf/api/authentication/authentication_test.go index 8e69b9690f9..a00143c9ee1 100644 --- a/cf/api/authentication/authentication_test.go +++ b/cf/api/authentication/authentication_test.go @@ -16,7 +16,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/authentication" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/buildpack_bits_test.go b/cf/api/buildpack_bits_test.go index 25892813695..ae480e1fbba 100644 --- a/cf/api/buildpack_bits_test.go +++ b/cf/api/buildpack_bits_test.go @@ -26,7 +26,7 @@ import ( "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/buildpacks_test.go b/cf/api/buildpacks_test.go index 55a91a7020b..0cebb449ef7 100644 --- a/cf/api/buildpacks_test.go +++ b/cf/api/buildpacks_test.go @@ -16,7 +16,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/clients_test.go b/cf/api/clients_test.go index 717f762eb81..0749a849131 100644 --- a/cf/api/clients_test.go +++ b/cf/api/clients_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" "code.cloudfoundry.org/cli/cf/trace/tracefakes" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/cf/api/copyapplicationsource/copy_application_source_suite_test.go b/cf/api/copyapplicationsource/copy_application_source_suite_test.go index 1586abe7d6c..e32ffea0f3e 100644 --- a/cf/api/copyapplicationsource/copy_application_source_suite_test.go +++ b/cf/api/copyapplicationsource/copy_application_source_suite_test.go @@ -3,7 +3,7 @@ package copyapplicationsource_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/copyapplicationsource/copy_application_source_test.go b/cf/api/copyapplicationsource/copy_application_source_test.go index e519900176c..fa2b3139b95 100644 --- a/cf/api/copyapplicationsource/copy_application_source_test.go +++ b/cf/api/copyapplicationsource/copy_application_source_test.go @@ -14,7 +14,7 @@ import ( testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/curl_test.go b/cf/api/curl_test.go index 5d39bed01b5..34fcd62e4d1 100644 --- a/cf/api/curl_test.go +++ b/cf/api/curl_test.go @@ -16,7 +16,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/domains_test.go b/cf/api/domains_test.go index 8116787591f..54925d15bdb 100644 --- a/cf/api/domains_test.go +++ b/cf/api/domains_test.go @@ -17,7 +17,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/endpoints_test.go b/cf/api/endpoints_test.go index 3783d368c3f..3892bba24ed 100644 --- a/cf/api/endpoints_test.go +++ b/cf/api/endpoints_test.go @@ -18,7 +18,7 @@ import ( "code.cloudfoundry.org/cli/cf/trace/tracefakes" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go b/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go index 350717a93f3..5725fb98667 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups_suite_test.go @@ -3,7 +3,7 @@ package environmentvariablegroups_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/environmentvariablegroups/environment_variable_groups_test.go b/cf/api/environmentvariablegroups/environment_variable_groups_test.go index 66ae787604e..48a3724aebc 100644 --- a/cf/api/environmentvariablegroups/environment_variable_groups_test.go +++ b/cf/api/environmentvariablegroups/environment_variable_groups_test.go @@ -15,7 +15,7 @@ import ( "github.com/onsi/gomega/ghttp" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/featureflags/feature_flags_suite_test.go b/cf/api/featureflags/feature_flags_suite_test.go index 8c31682d15d..26e7da8db51 100644 --- a/cf/api/featureflags/feature_flags_suite_test.go +++ b/cf/api/featureflags/feature_flags_suite_test.go @@ -3,7 +3,7 @@ package featureflags_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/featureflags/feature_flags_test.go b/cf/api/featureflags/feature_flags_test.go index de9e378f571..6c0cf5f925b 100644 --- a/cf/api/featureflags/feature_flags_test.go +++ b/cf/api/featureflags/feature_flags_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/featureflags" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/log_cache_message_test.go b/cf/api/logs/log_cache_message_test.go index bc6abfbcaee..ee73874b72e 100644 --- a/cf/api/logs/log_cache_message_test.go +++ b/cf/api/logs/log_cache_message_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/cf/api/logs" "code.cloudfoundry.org/cli/cf/api/logs/logsfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/log_cache_repository_test.go b/cf/api/logs/log_cache_repository_test.go index 0b3dfd01a9d..a3c48c45a77 100644 --- a/cf/api/logs/log_cache_repository_test.go +++ b/cf/api/logs/log_cache_repository_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/actor/sharedaction" "code.cloudfoundry.org/cli/actor/sharedaction/sharedactionfakes" "code.cloudfoundry.org/cli/cf/api/logs" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/logs/logs_suite_test.go b/cf/api/logs/logs_suite_test.go index de2eeeab96e..8d5d23f342c 100644 --- a/cf/api/logs/logs_suite_test.go +++ b/cf/api/logs/logs_suite_test.go @@ -1,7 +1,7 @@ package logs_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/organizations/organizations_suite_test.go b/cf/api/organizations/organizations_suite_test.go index 967c5f0cba3..3c75cf6d186 100644 --- a/cf/api/organizations/organizations_suite_test.go +++ b/cf/api/organizations/organizations_suite_test.go @@ -3,7 +3,7 @@ package organizations_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/organizations/organizations_test.go b/cf/api/organizations/organizations_test.go index c1eecc5f709..8819e5fe40d 100644 --- a/cf/api/organizations/organizations_test.go +++ b/cf/api/organizations/organizations_test.go @@ -16,7 +16,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/organizations" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/password/password_suite_test.go b/cf/api/password/password_suite_test.go index 4cc33137c4e..9c8d685ba89 100644 --- a/cf/api/password/password_suite_test.go +++ b/cf/api/password/password_suite_test.go @@ -3,7 +3,7 @@ package password_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/password/password_test.go b/cf/api/password/password_test.go index e862eeb0367..b1b22d29c14 100644 --- a/cf/api/password/password_test.go +++ b/cf/api/password/password_test.go @@ -14,7 +14,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/password" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/quotas/quotas_suite_test.go b/cf/api/quotas/quotas_suite_test.go index ddfc0f192cc..04d290d00bd 100644 --- a/cf/api/quotas/quotas_suite_test.go +++ b/cf/api/quotas/quotas_suite_test.go @@ -3,7 +3,7 @@ package quotas_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/quotas/quotas_test.go b/cf/api/quotas/quotas_test.go index 5f74f846408..bfc056e5afa 100644 --- a/cf/api/quotas/quotas_test.go +++ b/cf/api/quotas/quotas_test.go @@ -17,7 +17,7 @@ import ( "encoding/json" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/applications_test.go b/cf/api/resources/applications_test.go index dbf863e83e6..e2ad37d376b 100644 --- a/cf/api/resources/applications_test.go +++ b/cf/api/resources/applications_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/resources" "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/events_test.go b/cf/api/resources/events_test.go index 23588ddc586..46cf9df9ec0 100644 --- a/cf/api/resources/events_test.go +++ b/cf/api/resources/events_test.go @@ -6,7 +6,7 @@ import ( "time" . "code.cloudfoundry.org/cli/cf/api/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/quotas_test.go b/cf/api/resources/quotas_test.go index 48ec1db79a0..a79e1712866 100644 --- a/cf/api/resources/quotas_test.go +++ b/cf/api/resources/quotas_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" "encoding/json" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/resources_test.go b/cf/api/resources/resources_test.go index bf510976af2..1e1735288d2 100644 --- a/cf/api/resources/resources_test.go +++ b/cf/api/resources/resources_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/service_instances_test.go b/cf/api/resources/service_instances_test.go index 48e943ff6d3..1b88be8a86c 100644 --- a/cf/api/resources/service_instances_test.go +++ b/cf/api/resources/service_instances_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/resources/service_keys_test.go b/cf/api/resources/service_keys_test.go index daa6af0a921..a74423b1cdb 100644 --- a/cf/api/resources/service_keys_test.go +++ b/cf/api/resources/service_keys_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/route_service_binding_repository_test.go b/cf/api/route_service_binding_repository_test.go index e92593210fa..47a8409de76 100644 --- a/cf/api/route_service_binding_repository_test.go +++ b/cf/api/route_service_binding_repository_test.go @@ -16,7 +16,7 @@ import ( "github.com/onsi/gomega/ghttp" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/routes_test.go b/cf/api/routes_test.go index cd46a0c2cad..e1862374acf 100644 --- a/cf/api/routes_test.go +++ b/cf/api/routes_test.go @@ -18,7 +18,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/routing_api_test.go b/cf/api/routing_api_test.go index e900e062fdf..37d874bb92e 100644 --- a/cf/api/routing_api_test.go +++ b/cf/api/routing_api_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" "code.cloudfoundry.org/cli/cf/trace/tracefakes" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/securitygroups/defaults/running/running_suite_test.go b/cf/api/securitygroups/defaults/running/running_suite_test.go index 6905947b397..beeaf9853e2 100644 --- a/cf/api/securitygroups/defaults/running/running_suite_test.go +++ b/cf/api/securitygroups/defaults/running/running_suite_test.go @@ -3,7 +3,7 @@ package running_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/securitygroups/defaults/running/running_test.go b/cf/api/securitygroups/defaults/running/running_test.go index 82e2e17039a..340d0b329fd 100644 --- a/cf/api/securitygroups/defaults/running/running_test.go +++ b/cf/api/securitygroups/defaults/running/running_test.go @@ -16,7 +16,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/securitygroups/defaults/running" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/defaults/staging/staging_suite_test.go b/cf/api/securitygroups/defaults/staging/staging_suite_test.go index 9c9776d5890..0e39b6127ab 100644 --- a/cf/api/securitygroups/defaults/staging/staging_suite_test.go +++ b/cf/api/securitygroups/defaults/staging/staging_suite_test.go @@ -3,7 +3,7 @@ package staging_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/securitygroups/defaults/staging/staging_test.go b/cf/api/securitygroups/defaults/staging/staging_test.go index c326a30f610..6d805551bb2 100644 --- a/cf/api/securitygroups/defaults/staging/staging_test.go +++ b/cf/api/securitygroups/defaults/staging/staging_test.go @@ -16,7 +16,7 @@ import ( testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/security_groups_suite_test.go b/cf/api/securitygroups/security_groups_suite_test.go index bd8a597549a..093c14f29a8 100644 --- a/cf/api/securitygroups/security_groups_suite_test.go +++ b/cf/api/securitygroups/security_groups_suite_test.go @@ -3,7 +3,7 @@ package securitygroups_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/securitygroups/security_groups_test.go b/cf/api/securitygroups/security_groups_test.go index 950486f1f62..c7846968046 100644 --- a/cf/api/securitygroups/security_groups_test.go +++ b/cf/api/securitygroups/security_groups_test.go @@ -17,7 +17,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/securitygroups" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/spaces/space_binder_test.go b/cf/api/securitygroups/spaces/space_binder_test.go index 5c592dd0984..f3992f96346 100644 --- a/cf/api/securitygroups/spaces/space_binder_test.go +++ b/cf/api/securitygroups/spaces/space_binder_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/securitygroups/spaces" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/securitygroups/spaces/suite_test.go b/cf/api/securitygroups/spaces/suite_test.go index 4f5f14b2604..935c3f694a8 100644 --- a/cf/api/securitygroups/spaces/suite_test.go +++ b/cf/api/securitygroups/spaces/suite_test.go @@ -3,7 +3,7 @@ package spaces_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/service_auth_tokens_test.go b/cf/api/service_auth_tokens_test.go index df138ca79ab..2a8fba16eb7 100644 --- a/cf/api/service_auth_tokens_test.go +++ b/cf/api/service_auth_tokens_test.go @@ -17,7 +17,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_bindings_test.go b/cf/api/service_bindings_test.go index 4a94561309b..1d7f9dcb1d0 100644 --- a/cf/api/service_bindings_test.go +++ b/cf/api/service_bindings_test.go @@ -13,7 +13,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/service_brokers_test.go b/cf/api/service_brokers_test.go index 232f611c400..6c979f1135c 100644 --- a/cf/api/service_brokers_test.go +++ b/cf/api/service_brokers_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/service_keys_test.go b/cf/api/service_keys_test.go index f8fb7a9cc1a..f404f12ac04 100644 --- a/cf/api/service_keys_test.go +++ b/cf/api/service_keys_test.go @@ -17,7 +17,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_plan_test.go b/cf/api/service_plan_test.go index 377e7314b94..26a74c13d07 100644 --- a/cf/api/service_plan_test.go +++ b/cf/api/service_plan_test.go @@ -16,7 +16,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_plan_visibility_test.go b/cf/api/service_plan_visibility_test.go index 860e8a9b1e6..cb17887ee42 100644 --- a/cf/api/service_plan_visibility_test.go +++ b/cf/api/service_plan_visibility_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/service_summary_test.go b/cf/api/service_summary_test.go index 39fa73f6975..15e7b1bd0d3 100644 --- a/cf/api/service_summary_test.go +++ b/cf/api/service_summary_test.go @@ -14,7 +14,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/services_test.go b/cf/api/services_test.go index c1a417e12c6..62d5b1f476a 100644 --- a/cf/api/services_test.go +++ b/cf/api/services_test.go @@ -20,7 +20,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/spacequotas/space_quotas_suite_test.go b/cf/api/spacequotas/space_quotas_suite_test.go index 0322194b783..92d80051778 100644 --- a/cf/api/spacequotas/space_quotas_suite_test.go +++ b/cf/api/spacequotas/space_quotas_suite_test.go @@ -3,7 +3,7 @@ package spacequotas_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/spacequotas/space_quotas_test.go b/cf/api/spacequotas/space_quotas_test.go index 8431c9961c2..d895031c543 100644 --- a/cf/api/spacequotas/space_quotas_test.go +++ b/cf/api/spacequotas/space_quotas_test.go @@ -16,7 +16,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/spaces/spaces_suite_test.go b/cf/api/spaces/spaces_suite_test.go index 5e86e2aba4d..4fa12fe9ce2 100644 --- a/cf/api/spaces/spaces_suite_test.go +++ b/cf/api/spaces/spaces_suite_test.go @@ -3,7 +3,7 @@ package spaces_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/spaces/spaces_test.go b/cf/api/spaces/spaces_test.go index 26bdaa5b82a..157cb557444 100644 --- a/cf/api/spaces/spaces_test.go +++ b/cf/api/spaces/spaces_test.go @@ -17,7 +17,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/spaces" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/api/stacks/stacks_suite_test.go b/cf/api/stacks/stacks_suite_test.go index 576f2248dc6..0b75daba4be 100644 --- a/cf/api/stacks/stacks_suite_test.go +++ b/cf/api/stacks/stacks_suite_test.go @@ -3,7 +3,7 @@ package stacks_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/api/stacks/stacks_test.go b/cf/api/stacks/stacks_test.go index 183ec1543c3..65a78a827a5 100644 --- a/cf/api/stacks/stacks_test.go +++ b/cf/api/stacks/stacks_test.go @@ -16,7 +16,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api/stacks" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/user_provided_service_instances_test.go b/cf/api/user_provided_service_instances_test.go index fa99f542945..87dd06baadf 100644 --- a/cf/api/user_provided_service_instances_test.go +++ b/cf/api/user_provided_service_instances_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/api" "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/api/users_test.go b/cf/api/users_test.go index e92facd57cd..a2f06eddbbd 100644 --- a/cf/api/users_test.go +++ b/cf/api/users_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/appfiles/app_files_suite_test.go b/cf/appfiles/app_files_suite_test.go index 402a19448c0..eccda8a285c 100644 --- a/cf/appfiles/app_files_suite_test.go +++ b/cf/appfiles/app_files_suite_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/appfiles/app_files_test.go b/cf/appfiles/app_files_test.go index 1e186968d46..63e79ce3571 100644 --- a/cf/appfiles/app_files_test.go +++ b/cf/appfiles/app_files_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" "code.cloudfoundry.org/gofileutils/fileutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/appfiles/cf_ignore_test.go b/cf/appfiles/cf_ignore_test.go index 2814771fbcf..12410ce8a83 100644 --- a/cf/appfiles/cf_ignore_test.go +++ b/cf/appfiles/cf_ignore_test.go @@ -2,7 +2,7 @@ package appfiles_test import ( . "code.cloudfoundry.org/cli/cf/appfiles" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/appfiles/zipper_test.go b/cf/appfiles/zipper_test.go index e57d0d02f29..a262b2fdcf9 100644 --- a/cf/appfiles/zipper_test.go +++ b/cf/appfiles/zipper_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/appfiles" "code.cloudfoundry.org/gofileutils/fileutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commandregistry/command_registry_suite_test.go b/cf/commandregistry/command_registry_suite_test.go index 7eb9c7c7092..2aea6bddf13 100644 --- a/cf/commandregistry/command_registry_suite_test.go +++ b/cf/commandregistry/command_registry_suite_test.go @@ -1,7 +1,7 @@ package commandregistry_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commandregistry/dependency_test.go b/cf/commandregistry/dependency_test.go index 4f93d0ca41f..a58824a9799 100644 --- a/cf/commandregistry/dependency_test.go +++ b/cf/commandregistry/dependency_test.go @@ -6,7 +6,7 @@ import ( "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commandregistry/registry_test.go b/cf/commandregistry/registry_test.go index f8c709fad4d..86c5cfea4dc 100644 --- a/cf/commandregistry/registry_test.go +++ b/cf/commandregistry/registry_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" . "code.cloudfoundry.org/cli/cf/i18n" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/api_test.go b/cf/commands/api_test.go index 294f00afa92..93d86d5ad66 100644 --- a/cf/commands/api_test.go +++ b/cf/commands/api_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/cf/errors" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/api" diff --git a/cf/commands/application/app_test.go b/cf/commands/application/app_test.go index 7ca948da350..c419071b81e 100644 --- a/cf/commands/application/app_test.go +++ b/cf/commands/application/app_test.go @@ -25,7 +25,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/application_suite_test.go b/cf/commands/application/application_suite_test.go index 2067c9106ee..7d66957acfd 100644 --- a/cf/commands/application/application_suite_test.go +++ b/cf/commands/application/application_suite_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/application/apps_test.go b/cf/commands/application/apps_test.go index aaaebb32d59..3ad32e19e38 100644 --- a/cf/commands/application/apps_test.go +++ b/cf/commands/application/apps_test.go @@ -12,7 +12,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" "code.cloudfoundry.org/cli/plugin/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" diff --git a/cf/commands/application/copy_source_test.go b/cf/commands/application/copy_source_test.go index 1d72044b8bf..5d8e6ba0a22 100644 --- a/cf/commands/application/copy_source_test.go +++ b/cf/commands/application/copy_source_test.go @@ -19,7 +19,7 @@ import ( "code.cloudfoundry.org/cli/cf/errors" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/delete_test.go b/cf/commands/application/delete_test.go index d1f101ecf84..23d2bef4100 100644 --- a/cf/commands/application/delete_test.go +++ b/cf/commands/application/delete_test.go @@ -12,7 +12,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/application/disable_ssh_test.go b/cf/commands/application/disable_ssh_test.go index 5dd2ad639e9..b223af0b660 100644 --- a/cf/commands/application/disable_ssh_test.go +++ b/cf/commands/application/disable_ssh_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/enable_ssh_test.go b/cf/commands/application/enable_ssh_test.go index e2da654049e..aa820d3252e 100644 --- a/cf/commands/application/enable_ssh_test.go +++ b/cf/commands/application/enable_ssh_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/env_test.go b/cf/commands/application/env_test.go index b3ab8748f09..a4493225004 100644 --- a/cf/commands/application/env_test.go +++ b/cf/commands/application/env_test.go @@ -13,7 +13,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/events_test.go b/cf/commands/application/events_test.go index b6252d8d410..c75b8507ce5 100644 --- a/cf/commands/application/events_test.go +++ b/cf/commands/application/events_test.go @@ -17,7 +17,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/files_test.go b/cf/commands/application/files_test.go index 09cf81673e1..cf8520b4155 100644 --- a/cf/commands/application/files_test.go +++ b/cf/commands/application/files_test.go @@ -16,7 +16,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/get_health_check_test.go b/cf/commands/application/get_health_check_test.go index f5ccd1002cd..33b4071cdfb 100644 --- a/cf/commands/application/get_health_check_test.go +++ b/cf/commands/application/get_health_check_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/logs_test.go b/cf/commands/application/logs_test.go index 8da4d1416f1..e82d6e04d87 100644 --- a/cf/commands/application/logs_test.go +++ b/cf/commands/application/logs_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/cf/configuration/coreconfig" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/push_test.go b/cf/commands/application/push_test.go index 89cad1e5020..2447c675510 100644 --- a/cf/commands/application/push_test.go +++ b/cf/commands/application/push_test.go @@ -30,7 +30,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" ) diff --git a/cf/commands/application/rename_test.go b/cf/commands/application/rename_test.go index 96b786a6341..eda7d25bcc5 100644 --- a/cf/commands/application/rename_test.go +++ b/cf/commands/application/rename_test.go @@ -12,7 +12,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/restage_test.go b/cf/commands/application/restage_test.go index a933a4d0bd1..e55890f7ba6 100644 --- a/cf/commands/application/restage_test.go +++ b/cf/commands/application/restage_test.go @@ -13,7 +13,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/restart_app_instance_test.go b/cf/commands/application/restart_app_instance_test.go index 75b007b4cbe..b7e5f3545e9 100644 --- a/cf/commands/application/restart_app_instance_test.go +++ b/cf/commands/application/restart_app_instance_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/restart_test.go b/cf/commands/application/restart_test.go index 0de6d4490f4..c4d2ba48cd0 100644 --- a/cf/commands/application/restart_test.go +++ b/cf/commands/application/restart_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" "code.cloudfoundry.org/cli/cf/configuration/coreconfig" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/scale_test.go b/cf/commands/application/scale_test.go index 9bd0a906908..368e6241e42 100644 --- a/cf/commands/application/scale_test.go +++ b/cf/commands/application/scale_test.go @@ -11,7 +11,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/application/set_env_test.go b/cf/commands/application/set_env_test.go index 108dc7d8de4..6089e957218 100644 --- a/cf/commands/application/set_env_test.go +++ b/cf/commands/application/set_env_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/set_health_check_test.go b/cf/commands/application/set_health_check_test.go index bf62455c23d..18c1fc26947 100644 --- a/cf/commands/application/set_health_check_test.go +++ b/cf/commands/application/set_health_check_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/ssh_enabled_test.go b/cf/commands/application/ssh_enabled_test.go index 1ef7c05132e..a5ef948be20 100644 --- a/cf/commands/application/ssh_enabled_test.go +++ b/cf/commands/application/ssh_enabled_test.go @@ -11,7 +11,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/ssh_test.go b/cf/commands/application/ssh_test.go index d12164f3bb9..99c93cc3228 100644 --- a/cf/commands/application/ssh_test.go +++ b/cf/commands/application/ssh_test.go @@ -22,7 +22,7 @@ import ( "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/start_test.go b/cf/commands/application/start_test.go index 8b161e40e37..fddba65a4ff 100644 --- a/cf/commands/application/start_test.go +++ b/cf/commands/application/start_test.go @@ -30,7 +30,7 @@ import ( "sync/atomic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/stop_test.go b/cf/commands/application/stop_test.go index 93c2c83c77c..d118e219df5 100644 --- a/cf/commands/application/stop_test.go +++ b/cf/commands/application/stop_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" "code.cloudfoundry.org/cli/cf/commands/application" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/application/unset_env_test.go b/cf/commands/application/unset_env_test.go index 3917233915f..64fca2773ed 100644 --- a/cf/commands/application/unset_env_test.go +++ b/cf/commands/application/unset_env_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/auth_test.go b/cf/commands/auth_test.go index ec81d8e3617..03202145677 100644 --- a/cf/commands/auth_test.go +++ b/cf/commands/auth_test.go @@ -13,7 +13,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" diff --git a/cf/commands/buildpack/buildpack_suite_test.go b/cf/commands/buildpack/buildpack_suite_test.go index 645b9c09487..a5d02389fc0 100644 --- a/cf/commands/buildpack/buildpack_suite_test.go +++ b/cf/commands/buildpack/buildpack_suite_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/buildpack/buildpacks_test.go b/cf/commands/buildpack/buildpacks_test.go index 03c1f8164a1..d50f0314699 100644 --- a/cf/commands/buildpack/buildpacks_test.go +++ b/cf/commands/buildpack/buildpacks_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/buildpack" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/buildpack/create_buildpack_test.go b/cf/commands/buildpack/create_buildpack_test.go index aed50533098..8a5870fbb43 100644 --- a/cf/commands/buildpack/create_buildpack_test.go +++ b/cf/commands/buildpack/create_buildpack_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/buildpack/delete_buildpack_test.go b/cf/commands/buildpack/delete_buildpack_test.go index 119c8d34872..4829e1c82bd 100644 --- a/cf/commands/buildpack/delete_buildpack_test.go +++ b/cf/commands/buildpack/delete_buildpack_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/buildpack/rename_buildpack_test.go b/cf/commands/buildpack/rename_buildpack_test.go index 316c82e8a0e..d6cc8333250 100644 --- a/cf/commands/buildpack/rename_buildpack_test.go +++ b/cf/commands/buildpack/rename_buildpack_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/buildpack/update_buildpack_test.go b/cf/commands/buildpack/update_buildpack_test.go index f2160f1c1ab..64c572985d7 100644 --- a/cf/commands/buildpack/update_buildpack_test.go +++ b/cf/commands/buildpack/update_buildpack_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/commands_suite_test.go b/cf/commands/commands_suite_test.go index 88f26b1a8f4..c3529d26edd 100644 --- a/cf/commands/commands_suite_test.go +++ b/cf/commands/commands_suite_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands" "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/cf/commands/config_test.go b/cf/commands/config_test.go index 1b1c3a28d8a..a2f4630dd54 100644 --- a/cf/commands/config_test.go +++ b/cf/commands/config_test.go @@ -9,7 +9,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/create_app_manifest_test.go b/cf/commands/create_app_manifest_test.go index 1d913ca8bbe..ad3b71d9b76 100644 --- a/cf/commands/create_app_manifest_test.go +++ b/cf/commands/create_app_manifest_test.go @@ -22,7 +22,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" uuid "github.com/nu7hatch/gouuid" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/curl_test.go b/cf/commands/curl_test.go index 7d046d21f89..870836436e5 100644 --- a/cf/commands/curl_test.go +++ b/cf/commands/curl_test.go @@ -18,7 +18,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" "code.cloudfoundry.org/cli/cf/trace" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/create_domain_test.go b/cf/commands/domain/create_domain_test.go index 42900f1f333..c2fd102c87a 100644 --- a/cf/commands/domain/create_domain_test.go +++ b/cf/commands/domain/create_domain_test.go @@ -12,7 +12,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/create_shared_domain_test.go b/cf/commands/domain/create_shared_domain_test.go index aeb90c422a8..33ee11a1001 100644 --- a/cf/commands/domain/create_shared_domain_test.go +++ b/cf/commands/domain/create_shared_domain_test.go @@ -17,7 +17,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/domain" "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/delete_domain_test.go b/cf/commands/domain/delete_domain_test.go index 5dfbdf4a879..a4af8db6a77 100644 --- a/cf/commands/domain/delete_domain_test.go +++ b/cf/commands/domain/delete_domain_test.go @@ -11,7 +11,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/domain/delete_shared_domain_test.go b/cf/commands/domain/delete_shared_domain_test.go index 6b23eedb0ba..c3517a09c43 100644 --- a/cf/commands/domain/delete_shared_domain_test.go +++ b/cf/commands/domain/delete_shared_domain_test.go @@ -13,7 +13,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/domain/domain_suite_test.go b/cf/commands/domain/domain_suite_test.go index c696c68d042..1134db11e9f 100644 --- a/cf/commands/domain/domain_suite_test.go +++ b/cf/commands/domain/domain_suite_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/domain/domains_test.go b/cf/commands/domain/domains_test.go index 4ad9a0c1528..4c0e07406a2 100644 --- a/cf/commands/domain/domains_test.go +++ b/cf/commands/domain/domains_test.go @@ -18,7 +18,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/cf/commands/domain" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go b/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go index 20c66b47a75..1390d465359 100644 --- a/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go +++ b/cf/commands/environmentvariablegroup/environmentvariablegroup_suite_test.go @@ -3,7 +3,7 @@ package environmentvariablegroup_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go index 40d13e8f4ce..51a06ebf13e 100644 --- a/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/running_environment_variable_group_test.go @@ -13,7 +13,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go index ea20e503d07..ebe73f6c22e 100644 --- a/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/set_running_environment_variable_group_test.go @@ -11,7 +11,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go index 48ec90e844b..a5c3a05a2bc 100644 --- a/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/set_staging_environment_variable_group_test.go @@ -11,7 +11,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go b/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go index 4ddc50cb20d..affe6255406 100644 --- a/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go +++ b/cf/commands/environmentvariablegroup/staging_environment_variable_group_test.go @@ -13,7 +13,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/disable_feature_flag_test.go b/cf/commands/featureflag/disable_feature_flag_test.go index 91cc631fda7..c5a33a98a59 100644 --- a/cf/commands/featureflag/disable_feature_flag_test.go +++ b/cf/commands/featureflag/disable_feature_flag_test.go @@ -12,7 +12,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/enable_feature_flag_test.go b/cf/commands/featureflag/enable_feature_flag_test.go index 157eab5a4b0..f08ebdcdc96 100644 --- a/cf/commands/featureflag/enable_feature_flag_test.go +++ b/cf/commands/featureflag/enable_feature_flag_test.go @@ -12,7 +12,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/feature_flag_test.go b/cf/commands/featureflag/feature_flag_test.go index 7f23cab5961..bb7a483ee17 100644 --- a/cf/commands/featureflag/feature_flag_test.go +++ b/cf/commands/featureflag/feature_flag_test.go @@ -13,7 +13,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/feature_flags_test.go b/cf/commands/featureflag/feature_flags_test.go index 305c74e3bc9..1c0599416c9 100644 --- a/cf/commands/featureflag/feature_flags_test.go +++ b/cf/commands/featureflag/feature_flags_test.go @@ -15,7 +15,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/featureflag/featureflag_suite_test.go b/cf/commands/featureflag/featureflag_suite_test.go index ebb4558e84d..29d57065073 100644 --- a/cf/commands/featureflag/featureflag_suite_test.go +++ b/cf/commands/featureflag/featureflag_suite_test.go @@ -3,7 +3,7 @@ package featureflag_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/help_test.go b/cf/commands/help_test.go index 0ea5301bcad..b9e838d3f45 100644 --- a/cf/commands/help_test.go +++ b/cf/commands/help_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/cf/flags" "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" ) diff --git a/cf/commands/login_test.go b/cf/commands/login_test.go index bde9d340e28..09d81bcc944 100644 --- a/cf/commands/login_test.go +++ b/cf/commands/login_test.go @@ -14,7 +14,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/logout_test.go b/cf/commands/logout_test.go index 7625ab8a4d1..1ac2947ed21 100644 --- a/cf/commands/logout_test.go +++ b/cf/commands/logout_test.go @@ -7,7 +7,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/oauth_token_test.go b/cf/commands/oauth_token_test.go index 7883c92691f..4e74a28de30 100644 --- a/cf/commands/oauth_token_test.go +++ b/cf/commands/oauth_token_test.go @@ -17,7 +17,7 @@ import ( "os" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/create_org_test.go b/cf/commands/organization/create_org_test.go index a966a80ffe2..d4f78576149 100644 --- a/cf/commands/organization/create_org_test.go +++ b/cf/commands/organization/create_org_test.go @@ -17,7 +17,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/delete_org_test.go b/cf/commands/organization/delete_org_test.go index dc7eeac16f4..f0fea1a9d61 100644 --- a/cf/commands/organization/delete_org_test.go +++ b/cf/commands/organization/delete_org_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/org_test.go b/cf/commands/organization/org_test.go index 5edc37bfe73..f310f83184a 100644 --- a/cf/commands/organization/org_test.go +++ b/cf/commands/organization/org_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/organization" "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/organization/organization_suite_test.go b/cf/commands/organization/organization_suite_test.go index 4651be2cf18..6f809a00db5 100644 --- a/cf/commands/organization/organization_suite_test.go +++ b/cf/commands/organization/organization_suite_test.go @@ -3,7 +3,7 @@ package organization_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/organization/orgs_test.go b/cf/commands/organization/orgs_test.go index 9d5d025f399..ae0d7822baf 100644 --- a/cf/commands/organization/orgs_test.go +++ b/cf/commands/organization/orgs_test.go @@ -15,7 +15,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" "code.cloudfoundry.org/cli/plugin/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/commands/organization" diff --git a/cf/commands/organization/rename_org_test.go b/cf/commands/organization/rename_org_test.go index e75b34c17c8..8d9fe048cdf 100644 --- a/cf/commands/organization/rename_org_test.go +++ b/cf/commands/organization/rename_org_test.go @@ -10,7 +10,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/organization/set_quota_test.go b/cf/commands/organization/set_quota_test.go index d12280f6907..166bc33525c 100644 --- a/cf/commands/organization/set_quota_test.go +++ b/cf/commands/organization/set_quota_test.go @@ -12,7 +12,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/passwd_test.go b/cf/commands/passwd_test.go index 78d5e09b416..2a7b9a25021 100644 --- a/cf/commands/passwd_test.go +++ b/cf/commands/passwd_test.go @@ -10,7 +10,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/plugin/install_plugin_test.go b/cf/commands/plugin/install_plugin_test.go index 5701b371b24..5e7e3645e6b 100644 --- a/cf/commands/plugin/install_plugin_test.go +++ b/cf/commands/plugin/install_plugin_test.go @@ -30,7 +30,7 @@ import ( clipr "code.cloudfoundry.org/cli-plugin-repo/web" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/plugin/plugin_suite_test.go b/cf/commands/plugin/plugin_suite_test.go index 624ec134409..c970694347c 100644 --- a/cf/commands/plugin/plugin_suite_test.go +++ b/cf/commands/plugin/plugin_suite_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/plugin/plugins_test.go b/cf/commands/plugin/plugins_test.go index b0b6c4b54ce..3f9caea8fd0 100644 --- a/cf/commands/plugin/plugins_test.go +++ b/cf/commands/plugin/plugins_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" "code.cloudfoundry.org/cli/plugin" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/plugin/uninstall_plugin_test.go b/cf/commands/plugin/uninstall_plugin_test.go index e5e32911a7b..eccf500ad65 100644 --- a/cf/commands/plugin/uninstall_plugin_test.go +++ b/cf/commands/plugin/uninstall_plugin_test.go @@ -16,7 +16,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/pluginrepo/add_plugin_repo_test.go b/cf/commands/pluginrepo/add_plugin_repo_test.go index 81cc767e637..4c1189e7c7c 100644 --- a/cf/commands/pluginrepo/add_plugin_repo_test.go +++ b/cf/commands/pluginrepo/add_plugin_repo_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/pluginrepo/list_plugin_repos_test.go b/cf/commands/pluginrepo/list_plugin_repos_test.go index fb562e2446a..246ddfb4126 100644 --- a/cf/commands/pluginrepo/list_plugin_repos_test.go +++ b/cf/commands/pluginrepo/list_plugin_repos_test.go @@ -12,7 +12,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/pluginrepo/plugin_repo_suite_test.go b/cf/commands/pluginrepo/plugin_repo_suite_test.go index ffdf5b8f1ec..eb1596a24e3 100644 --- a/cf/commands/pluginrepo/plugin_repo_suite_test.go +++ b/cf/commands/pluginrepo/plugin_repo_suite_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/pluginrepo/remove_plugin_repo_test.go b/cf/commands/pluginrepo/remove_plugin_repo_test.go index a1241d3ff26..679f75bdca4 100644 --- a/cf/commands/pluginrepo/remove_plugin_repo_test.go +++ b/cf/commands/pluginrepo/remove_plugin_repo_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/pluginrepo/repo_plugins_test.go b/cf/commands/pluginrepo/repo_plugins_test.go index 31149d37c97..d1cc91420ac 100644 --- a/cf/commands/pluginrepo/repo_plugins_test.go +++ b/cf/commands/pluginrepo/repo_plugins_test.go @@ -15,7 +15,7 @@ import ( clipr "code.cloudfoundry.org/cli-plugin-repo/web" "code.cloudfoundry.org/cli/cf/flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/create_quota_test.go b/cf/commands/quota/create_quota_test.go index 1dc360d9290..4baad819055 100644 --- a/cf/commands/quota/create_quota_test.go +++ b/cf/commands/quota/create_quota_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/configuration/coreconfig" "code.cloudfoundry.org/cli/cf/flags" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "encoding/json" diff --git a/cf/commands/quota/delete_quota_test.go b/cf/commands/quota/delete_quota_test.go index f3fb67788a3..936521414b3 100644 --- a/cf/commands/quota/delete_quota_test.go +++ b/cf/commands/quota/delete_quota_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" "code.cloudfoundry.org/cli/cf/configuration/coreconfig" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/quota_suite_test.go b/cf/commands/quota/quota_suite_test.go index 6b85a5162bb..87b6847303e 100644 --- a/cf/commands/quota/quota_suite_test.go +++ b/cf/commands/quota/quota_suite_test.go @@ -3,7 +3,7 @@ package quota_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/quota/quota_test.go b/cf/commands/quota/quota_test.go index a9cc5338bf8..bc1a7ff6c13 100644 --- a/cf/commands/quota/quota_test.go +++ b/cf/commands/quota/quota_test.go @@ -1,7 +1,7 @@ package quota_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/api/quotas/quotasfakes" diff --git a/cf/commands/quota/quotas_test.go b/cf/commands/quota/quotas_test.go index b1943718a40..2d74520bac4 100644 --- a/cf/commands/quota/quotas_test.go +++ b/cf/commands/quota/quotas_test.go @@ -16,7 +16,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" "code.cloudfoundry.org/cli/cf/configuration/coreconfig" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/quota/update_quota_test.go b/cf/commands/quota/update_quota_test.go index dfb4923fe34..d149aa4e645 100644 --- a/cf/commands/quota/update_quota_test.go +++ b/cf/commands/quota/update_quota_test.go @@ -18,7 +18,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" "code.cloudfoundry.org/cli/cf/requirements" "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/check_route_test.go b/cf/commands/route/check_route_test.go index b59505a9e91..960c7b7affa 100644 --- a/cf/commands/route/check_route_test.go +++ b/cf/commands/route/check_route_test.go @@ -17,7 +17,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/create_route_test.go b/cf/commands/route/create_route_test.go index 2ba6aa71fe5..e68a88bdc52 100644 --- a/cf/commands/route/create_route_test.go +++ b/cf/commands/route/create_route_test.go @@ -17,7 +17,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/delete_orphaned_routes_test.go b/cf/commands/route/delete_orphaned_routes_test.go index f74e9de88cd..dcc43843bb8 100644 --- a/cf/commands/route/delete_orphaned_routes_test.go +++ b/cf/commands/route/delete_orphaned_routes_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/route" "code.cloudfoundry.org/cli/cf/configuration/coreconfig" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/delete_route_test.go b/cf/commands/route/delete_route_test.go index bbbc800b003..44be4ba9ead 100644 --- a/cf/commands/route/delete_route_test.go +++ b/cf/commands/route/delete_route_test.go @@ -18,7 +18,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/map_route_test.go b/cf/commands/route/map_route_test.go index 42cb38bb47b..ed11581b32a 100644 --- a/cf/commands/route/map_route_test.go +++ b/cf/commands/route/map_route_test.go @@ -20,7 +20,7 @@ import ( "strings" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/route/route_suite_test.go b/cf/commands/route/route_suite_test.go index e696c8249a4..c08170a3660 100644 --- a/cf/commands/route/route_suite_test.go +++ b/cf/commands/route/route_suite_test.go @@ -3,7 +3,7 @@ package route_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/route/routes_test.go b/cf/commands/route/routes_test.go index 52f375a942f..e21101f89ca 100644 --- a/cf/commands/route/routes_test.go +++ b/cf/commands/route/routes_test.go @@ -14,7 +14,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/commands/route" diff --git a/cf/commands/route/unmap_route_test.go b/cf/commands/route/unmap_route_test.go index 592507b52e8..1784e8ee0c7 100644 --- a/cf/commands/route/unmap_route_test.go +++ b/cf/commands/route/unmap_route_test.go @@ -19,7 +19,7 @@ import ( "strings" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/routergroups/router_groups_test.go b/cf/commands/routergroups/router_groups_test.go index 232e7d4bebd..4377182cd0b 100644 --- a/cf/commands/routergroups/router_groups_test.go +++ b/cf/commands/routergroups/router_groups_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/routergroups" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/routergroups/routergroups_suite_test.go b/cf/commands/routergroups/routergroups_suite_test.go index a2f69080617..2c07f499dbe 100644 --- a/cf/commands/routergroups/routergroups_suite_test.go +++ b/cf/commands/routergroups/routergroups_suite_test.go @@ -3,7 +3,7 @@ package routergroups_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/securitygroup/bind_running_security_group_test.go b/cf/commands/securitygroup/bind_running_security_group_test.go index a4706c6327a..79a2fcedb0c 100644 --- a/cf/commands/securitygroup/bind_running_security_group_test.go +++ b/cf/commands/securitygroup/bind_running_security_group_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/bind_security_group_test.go b/cf/commands/securitygroup/bind_security_group_test.go index 1520177b180..d7b26669a30 100644 --- a/cf/commands/securitygroup/bind_security_group_test.go +++ b/cf/commands/securitygroup/bind_security_group_test.go @@ -16,7 +16,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/bind_staging_security_group_test.go b/cf/commands/securitygroup/bind_staging_security_group_test.go index 9b56dbd63f3..9b38fa6f7ea 100644 --- a/cf/commands/securitygroup/bind_staging_security_group_test.go +++ b/cf/commands/securitygroup/bind_staging_security_group_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/create_security_group_test.go b/cf/commands/securitygroup/create_security_group_test.go index 92bd672b3a2..a3b07f35786 100644 --- a/cf/commands/securitygroup/create_security_group_test.go +++ b/cf/commands/securitygroup/create_security_group_test.go @@ -15,7 +15,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/delete_security_group_test.go b/cf/commands/securitygroup/delete_security_group_test.go index 973f90d5751..bba0e5a5922 100644 --- a/cf/commands/securitygroup/delete_security_group_test.go +++ b/cf/commands/securitygroup/delete_security_group_test.go @@ -13,7 +13,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/running_security_groups_test.go b/cf/commands/securitygroup/running_security_groups_test.go index 4d4287c8de2..519c5281f03 100644 --- a/cf/commands/securitygroup/running_security_groups_test.go +++ b/cf/commands/securitygroup/running_security_groups_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/security_group_test.go b/cf/commands/securitygroup/security_group_test.go index d15204d755e..dfdb9034a08 100644 --- a/cf/commands/securitygroup/security_group_test.go +++ b/cf/commands/securitygroup/security_group_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/security_groups_test.go b/cf/commands/securitygroup/security_groups_test.go index fd97a16976f..a7ee40ee96d 100644 --- a/cf/commands/securitygroup/security_groups_test.go +++ b/cf/commands/securitygroup/security_groups_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/securitygroup" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/staging_security_groups_test.go b/cf/commands/securitygroup/staging_security_groups_test.go index 169b8800cd8..65dc53ad1ec 100644 --- a/cf/commands/securitygroup/staging_security_groups_test.go +++ b/cf/commands/securitygroup/staging_security_groups_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/suite_test.go b/cf/commands/securitygroup/suite_test.go index aa752db5ab6..e0607c6b755 100644 --- a/cf/commands/securitygroup/suite_test.go +++ b/cf/commands/securitygroup/suite_test.go @@ -3,7 +3,7 @@ package securitygroup_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/securitygroup/unbind_running_security_group_test.go b/cf/commands/securitygroup/unbind_running_security_group_test.go index 04befbbd77f..18a5860cce2 100644 --- a/cf/commands/securitygroup/unbind_running_security_group_test.go +++ b/cf/commands/securitygroup/unbind_running_security_group_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/unbind_security_group_test.go b/cf/commands/securitygroup/unbind_security_group_test.go index 2a2ada51faa..14eafedec97 100644 --- a/cf/commands/securitygroup/unbind_security_group_test.go +++ b/cf/commands/securitygroup/unbind_security_group_test.go @@ -17,7 +17,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/unbind_staging_security_group_test.go b/cf/commands/securitygroup/unbind_staging_security_group_test.go index c2aebeaf587..df832815cc5 100644 --- a/cf/commands/securitygroup/unbind_staging_security_group_test.go +++ b/cf/commands/securitygroup/unbind_staging_security_group_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/securitygroup/update_security_group_test.go b/cf/commands/securitygroup/update_security_group_test.go index d748bdd4a31..477092709ef 100644 --- a/cf/commands/securitygroup/update_security_group_test.go +++ b/cf/commands/securitygroup/update_security_group_test.go @@ -16,7 +16,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/bind_route_service_test.go b/cf/commands/service/bind_route_service_test.go index be47e719549..fcdd8264d67 100644 --- a/cf/commands/service/bind_route_service_test.go +++ b/cf/commands/service/bind_route_service_test.go @@ -19,7 +19,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/bind_service_test.go b/cf/commands/service/bind_service_test.go index 4eadc1d693d..f87e080aaea 100644 --- a/cf/commands/service/bind_service_test.go +++ b/cf/commands/service/bind_service_test.go @@ -14,7 +14,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/errors" diff --git a/cf/commands/service/create_service_test.go b/cf/commands/service/create_service_test.go index 43b3e41798f..c794355e531 100644 --- a/cf/commands/service/create_service_test.go +++ b/cf/commands/service/create_service_test.go @@ -19,7 +19,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/service/create_user_provided_service_test.go b/cf/commands/service/create_user_provided_service_test.go index e1161d7bbf8..6db247a7929 100644 --- a/cf/commands/service/create_user_provided_service_test.go +++ b/cf/commands/service/create_user_provided_service_test.go @@ -18,7 +18,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/delete_service_test.go b/cf/commands/service/delete_service_test.go index ec43cb68985..40717f1196a 100644 --- a/cf/commands/service/delete_service_test.go +++ b/cf/commands/service/delete_service_test.go @@ -11,7 +11,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/service/marketplace_test.go b/cf/commands/service/marketplace_test.go index 8b59d72809c..06d236443ac 100644 --- a/cf/commands/service/marketplace_test.go +++ b/cf/commands/service/marketplace_test.go @@ -11,7 +11,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/commands/service" diff --git a/cf/commands/service/migrate_service_instances_test.go b/cf/commands/service/migrate_service_instances_test.go index 8dc41f27b8e..6cb83874d7c 100644 --- a/cf/commands/service/migrate_service_instances_test.go +++ b/cf/commands/service/migrate_service_instances_test.go @@ -11,7 +11,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/service/purge_service_instance_test.go b/cf/commands/service/purge_service_instance_test.go index 5f16b97eda1..dc7e8450305 100644 --- a/cf/commands/service/purge_service_instance_test.go +++ b/cf/commands/service/purge_service_instance_test.go @@ -19,7 +19,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/purge_service_offering_test.go b/cf/commands/service/purge_service_offering_test.go index a39407fe959..b114e6d0e2b 100644 --- a/cf/commands/service/purge_service_offering_test.go +++ b/cf/commands/service/purge_service_offering_test.go @@ -15,7 +15,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/rename_service_test.go b/cf/commands/service/rename_service_test.go index 8c6c604eca7..cb6c9bc1278 100644 --- a/cf/commands/service/rename_service_test.go +++ b/cf/commands/service/rename_service_test.go @@ -12,7 +12,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/service_suite_test.go b/cf/commands/service/service_suite_test.go index f06bc59dd97..c61fa706b20 100644 --- a/cf/commands/service/service_suite_test.go +++ b/cf/commands/service/service_suite_test.go @@ -3,7 +3,7 @@ package service_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/service/service_test.go b/cf/commands/service/service_test.go index 9c624c1ecd5..5c0bd774f83 100644 --- a/cf/commands/service/service_test.go +++ b/cf/commands/service/service_test.go @@ -16,7 +16,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/plugin/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/services_test.go b/cf/commands/service/services_test.go index 631df7ced8a..1093af70348 100644 --- a/cf/commands/service/services_test.go +++ b/cf/commands/service/services_test.go @@ -20,7 +20,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/cf/commands/service" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/unbind_route_service_test.go b/cf/commands/service/unbind_route_service_test.go index efd55a40c62..8c0fa50d3f1 100644 --- a/cf/commands/service/unbind_route_service_test.go +++ b/cf/commands/service/unbind_route_service_test.go @@ -17,7 +17,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/service/unbind_service_test.go b/cf/commands/service/unbind_service_test.go index e8d479d2dde..026d88ed30c 100644 --- a/cf/commands/service/unbind_service_test.go +++ b/cf/commands/service/unbind_service_test.go @@ -10,7 +10,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/service/update_service_test.go b/cf/commands/service/update_service_test.go index b484ea1ba9a..029d2fb276a 100644 --- a/cf/commands/service/update_service_test.go +++ b/cf/commands/service/update_service_test.go @@ -15,7 +15,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/service/update_user_provided_service_test.go b/cf/commands/service/update_user_provided_service_test.go index 18341678e74..36aa4c6deaf 100644 --- a/cf/commands/service/update_user_provided_service_test.go +++ b/cf/commands/service/update_user_provided_service_test.go @@ -19,7 +19,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/disable_service_access_test.go b/cf/commands/serviceaccess/disable_service_access_test.go index c648781dea3..7f99ec062ef 100644 --- a/cf/commands/serviceaccess/disable_service_access_test.go +++ b/cf/commands/serviceaccess/disable_service_access_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/enable_service_access_test.go b/cf/commands/serviceaccess/enable_service_access_test.go index 298687999b3..a182f38252f 100644 --- a/cf/commands/serviceaccess/enable_service_access_test.go +++ b/cf/commands/serviceaccess/enable_service_access_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/service_access_test.go b/cf/commands/serviceaccess/service_access_test.go index 9775ea1a0be..99e579e942c 100644 --- a/cf/commands/serviceaccess/service_access_test.go +++ b/cf/commands/serviceaccess/service_access_test.go @@ -18,7 +18,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/serviceaccess" "code.cloudfoundry.org/cli/cf/configuration/coreconfig" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceaccess/serviceaccess_suite_test.go b/cf/commands/serviceaccess/serviceaccess_suite_test.go index 371f4481067..0907c997e6b 100644 --- a/cf/commands/serviceaccess/serviceaccess_suite_test.go +++ b/cf/commands/serviceaccess/serviceaccess_suite_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/serviceauthtoken/create_service_auth_token_test.go b/cf/commands/serviceauthtoken/create_service_auth_token_test.go index 9005700b265..541e3169c2c 100644 --- a/cf/commands/serviceauthtoken/create_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/create_service_auth_token_test.go @@ -12,7 +12,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceauthtoken/delete_service_auth_token_test.go b/cf/commands/serviceauthtoken/delete_service_auth_token_test.go index 04e5a1bb1df..87f971ac1c4 100644 --- a/cf/commands/serviceauthtoken/delete_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/delete_service_auth_token_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" "code.cloudfoundry.org/cli/cf/requirements" "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" diff --git a/cf/commands/serviceauthtoken/service_auth_tokens_test.go b/cf/commands/serviceauthtoken/service_auth_tokens_test.go index eabbb105d24..3c6d7f8fb48 100644 --- a/cf/commands/serviceauthtoken/service_auth_tokens_test.go +++ b/cf/commands/serviceauthtoken/service_auth_tokens_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/serviceauthtoken" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go b/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go index 12972c6beb8..c58e9859ee5 100644 --- a/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go +++ b/cf/commands/serviceauthtoken/serviceauthtoken_suite_test.go @@ -3,7 +3,7 @@ package serviceauthtoken_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/serviceauthtoken/update_service_auth_token_test.go b/cf/commands/serviceauthtoken/update_service_auth_token_test.go index 93a1531e9c3..f671dbabfc1 100644 --- a/cf/commands/serviceauthtoken/update_service_auth_token_test.go +++ b/cf/commands/serviceauthtoken/update_service_auth_token_test.go @@ -12,7 +12,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/create_service_broker_test.go b/cf/commands/servicebroker/create_service_broker_test.go index 247ff85b80b..6742386d3bc 100644 --- a/cf/commands/servicebroker/create_service_broker_test.go +++ b/cf/commands/servicebroker/create_service_broker_test.go @@ -15,7 +15,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/delete_service_broker_test.go b/cf/commands/servicebroker/delete_service_broker_test.go index 6f78edb6fd4..09a91150702 100644 --- a/cf/commands/servicebroker/delete_service_broker_test.go +++ b/cf/commands/servicebroker/delete_service_broker_test.go @@ -12,7 +12,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/rename_service_broker_test.go b/cf/commands/servicebroker/rename_service_broker_test.go index edf124c29a2..aeea99f96a7 100644 --- a/cf/commands/servicebroker/rename_service_broker_test.go +++ b/cf/commands/servicebroker/rename_service_broker_test.go @@ -11,7 +11,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicebroker/service_brokers_test.go b/cf/commands/servicebroker/service_brokers_test.go index 4ac1dfd2423..ccf77690f9c 100644 --- a/cf/commands/servicebroker/service_brokers_test.go +++ b/cf/commands/servicebroker/service_brokers_test.go @@ -13,7 +13,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "strings" diff --git a/cf/commands/servicebroker/servicebroker_suite_test.go b/cf/commands/servicebroker/servicebroker_suite_test.go index e0da03b6405..b47a081abbc 100644 --- a/cf/commands/servicebroker/servicebroker_suite_test.go +++ b/cf/commands/servicebroker/servicebroker_suite_test.go @@ -3,7 +3,7 @@ package servicebroker_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/servicebroker/update_service_broker_test.go b/cf/commands/servicebroker/update_service_broker_test.go index 51a61dc14f8..fe69c995f2a 100644 --- a/cf/commands/servicebroker/update_service_broker_test.go +++ b/cf/commands/servicebroker/update_service_broker_test.go @@ -10,7 +10,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/servicekey/create_service_key_test.go b/cf/commands/servicekey/create_service_key_test.go index 3dcd00a9417..39526952d0b 100644 --- a/cf/commands/servicekey/create_service_key_test.go +++ b/cf/commands/servicekey/create_service_key_test.go @@ -18,7 +18,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicekey/delete_service_key_test.go b/cf/commands/servicekey/delete_service_key_test.go index ef29fee4b80..4fe1dbb8eec 100644 --- a/cf/commands/servicekey/delete_service_key_test.go +++ b/cf/commands/servicekey/delete_service_key_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicekey/service_key_test.go b/cf/commands/servicekey/service_key_test.go index 5e20e7172bd..eaf178a6040 100644 --- a/cf/commands/servicekey/service_key_test.go +++ b/cf/commands/servicekey/service_key_test.go @@ -15,7 +15,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicekey/service_keys_test.go b/cf/commands/servicekey/service_keys_test.go index 23e9366a552..f657caf0666 100644 --- a/cf/commands/servicekey/service_keys_test.go +++ b/cf/commands/servicekey/service_keys_test.go @@ -16,7 +16,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/servicekey/servicekey_suite_test.go b/cf/commands/servicekey/servicekey_suite_test.go index 0f2ce691219..37d37527186 100644 --- a/cf/commands/servicekey/servicekey_suite_test.go +++ b/cf/commands/servicekey/servicekey_suite_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/allow_space_ssh_test.go b/cf/commands/space/allow_space_ssh_test.go index a853ff71a20..141a556dfb6 100644 --- a/cf/commands/space/allow_space_ssh_test.go +++ b/cf/commands/space/allow_space_ssh_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/create_space_test.go b/cf/commands/space/create_space_test.go index a1ddd8c9089..2f52b593725 100644 --- a/cf/commands/space/create_space_test.go +++ b/cf/commands/space/create_space_test.go @@ -18,7 +18,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/delete_space_test.go b/cf/commands/space/delete_space_test.go index 88e49ef4ac2..38d0880439e 100644 --- a/cf/commands/space/delete_space_test.go +++ b/cf/commands/space/delete_space_test.go @@ -13,7 +13,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/space/disallow_space_ssh_test.go b/cf/commands/space/disallow_space_ssh_test.go index bf0b8daa557..0cc82512edd 100644 --- a/cf/commands/space/disallow_space_ssh_test.go +++ b/cf/commands/space/disallow_space_ssh_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/rename_space_test.go b/cf/commands/space/rename_space_test.go index f6d8b6fbc61..2b82fbac5b8 100644 --- a/cf/commands/space/rename_space_test.go +++ b/cf/commands/space/rename_space_test.go @@ -12,7 +12,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/space/space_ssh_allowed_test.go b/cf/commands/space/space_ssh_allowed_test.go index bad3f51ee7d..028ec8c5ddd 100644 --- a/cf/commands/space/space_ssh_allowed_test.go +++ b/cf/commands/space/space_ssh_allowed_test.go @@ -10,7 +10,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/space/space_suite_test.go b/cf/commands/space/space_suite_test.go index 8c04e5387b9..74d0383eece 100644 --- a/cf/commands/space/space_suite_test.go +++ b/cf/commands/space/space_suite_test.go @@ -3,7 +3,7 @@ package space_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/space/space_test.go b/cf/commands/space/space_test.go index 200f6e9d5d5..f0d6301e773 100644 --- a/cf/commands/space/space_test.go +++ b/cf/commands/space/space_test.go @@ -7,7 +7,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" "code.cloudfoundry.org/cli/plugin/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/api" diff --git a/cf/commands/space/spaces_test.go b/cf/commands/space/spaces_test.go index aa8fac60222..dc19e7ab0ad 100644 --- a/cf/commands/space/spaces_test.go +++ b/cf/commands/space/spaces_test.go @@ -19,7 +19,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/space" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/create_space_quota_test.go b/cf/commands/spacequota/create_space_quota_test.go index 112d85d3e4d..337d4507852 100644 --- a/cf/commands/spacequota/create_space_quota_test.go +++ b/cf/commands/spacequota/create_space_quota_test.go @@ -18,7 +18,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/spacequota" "code.cloudfoundry.org/cli/cf/flags" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/delete_space_quota_test.go b/cf/commands/spacequota/delete_space_quota_test.go index b7737ea5483..e58f51eae55 100644 --- a/cf/commands/spacequota/delete_space_quota_test.go +++ b/cf/commands/spacequota/delete_space_quota_test.go @@ -14,7 +14,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/set_space_quota_test.go b/cf/commands/spacequota/set_space_quota_test.go index 96dd5200224..eafc3503e76 100644 --- a/cf/commands/spacequota/set_space_quota_test.go +++ b/cf/commands/spacequota/set_space_quota_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/space_quota_test.go b/cf/commands/spacequota/space_quota_test.go index 9bacb6fe12c..7a83b45de21 100644 --- a/cf/commands/spacequota/space_quota_test.go +++ b/cf/commands/spacequota/space_quota_test.go @@ -13,7 +13,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/space_quotas_test.go b/cf/commands/spacequota/space_quotas_test.go index 755c83e1f3d..a2efb46bd53 100644 --- a/cf/commands/spacequota/space_quotas_test.go +++ b/cf/commands/spacequota/space_quotas_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/cf/commands/spacequota" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/spacequota_suite_test.go b/cf/commands/spacequota/spacequota_suite_test.go index f3f921a78e8..ca6f9b07226 100644 --- a/cf/commands/spacequota/spacequota_suite_test.go +++ b/cf/commands/spacequota/spacequota_suite_test.go @@ -3,7 +3,7 @@ package spacequota_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/spacequota/unset_space_quota_test.go b/cf/commands/spacequota/unset_space_quota_test.go index 9f71ab70d9f..9b348503d4e 100644 --- a/cf/commands/spacequota/unset_space_quota_test.go +++ b/cf/commands/spacequota/unset_space_quota_test.go @@ -15,7 +15,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/spacequota/update_space_quota_test.go b/cf/commands/spacequota/update_space_quota_test.go index fad0c96b6e8..a984e36c21b 100644 --- a/cf/commands/spacequota/update_space_quota_test.go +++ b/cf/commands/spacequota/update_space_quota_test.go @@ -14,8 +14,8 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/ssh_code_test.go b/cf/commands/ssh_code_test.go index e281c4bd2c7..34f2d49d695 100644 --- a/cf/commands/ssh_code_test.go +++ b/cf/commands/ssh_code_test.go @@ -16,7 +16,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/stack_test.go b/cf/commands/stack_test.go index 82e9639a0df..51138196b9c 100644 --- a/cf/commands/stack_test.go +++ b/cf/commands/stack_test.go @@ -11,7 +11,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/commandregistry" diff --git a/cf/commands/stacks_test.go b/cf/commands/stacks_test.go index 72b24a0e770..0cae63393a7 100644 --- a/cf/commands/stacks_test.go +++ b/cf/commands/stacks_test.go @@ -11,7 +11,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/commands" diff --git a/cf/commands/target_test.go b/cf/commands/target_test.go index b1e972bb9bb..08676260163 100644 --- a/cf/commands/target_test.go +++ b/cf/commands/target_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" "code.cloudfoundry.org/cli/cf/requirements" "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" diff --git a/cf/commands/user/create_user_test.go b/cf/commands/user/create_user_test.go index e7598400d72..7e964fc1a36 100644 --- a/cf/commands/user/create_user_test.go +++ b/cf/commands/user/create_user_test.go @@ -9,7 +9,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "code.cloudfoundry.org/cli/cf/commandregistry" diff --git a/cf/commands/user/delete_user_test.go b/cf/commands/user/delete_user_test.go index 0677a42aa78..ce79ef84cb9 100644 --- a/cf/commands/user/delete_user_test.go +++ b/cf/commands/user/delete_user_test.go @@ -11,7 +11,7 @@ import ( testcmd "code.cloudfoundry.org/cli/cf/util/testhelpers/commands" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/commands/user/org_users_test.go b/cf/commands/user/org_users_test.go index 7ead8a1c292..942b9597cd5 100644 --- a/cf/commands/user/org_users_test.go +++ b/cf/commands/user/org_users_test.go @@ -12,7 +12,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" plugin_models "code.cloudfoundry.org/cli/plugin/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" diff --git a/cf/commands/user/set_org_role_test.go b/cf/commands/user/set_org_role_test.go index 89cc51fdcc6..33c07a5952d 100644 --- a/cf/commands/user/set_org_role_test.go +++ b/cf/commands/user/set_org_role_test.go @@ -17,7 +17,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/set_space_role_test.go b/cf/commands/user/set_space_role_test.go index 3ddbff740f0..64d3926662d 100644 --- a/cf/commands/user/set_space_role_test.go +++ b/cf/commands/user/set_space_role_test.go @@ -18,7 +18,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/space_users_test.go b/cf/commands/user/space_users_test.go index 8af719a732b..a28f136e989 100644 --- a/cf/commands/user/space_users_test.go +++ b/cf/commands/user/space_users_test.go @@ -15,7 +15,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" plugin_models "code.cloudfoundry.org/cli/plugin/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "os" diff --git a/cf/commands/user/unset_org_role_test.go b/cf/commands/user/unset_org_role_test.go index 60c6191fd48..32f68ead1fd 100644 --- a/cf/commands/user/unset_org_role_test.go +++ b/cf/commands/user/unset_org_role_test.go @@ -17,7 +17,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/unset_space_role_test.go b/cf/commands/user/unset_space_role_test.go index 13c7cd1b130..cc42cbf4c6a 100644 --- a/cf/commands/user/unset_space_role_test.go +++ b/cf/commands/user/unset_space_role_test.go @@ -18,7 +18,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commands/user/user_suite_test.go b/cf/commands/user/user_suite_test.go index 64a29949870..720eecbf23f 100644 --- a/cf/commands/user/user_suite_test.go +++ b/cf/commands/user/user_suite_test.go @@ -3,7 +3,7 @@ package user_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commands/version_test.go b/cf/commands/version_test.go index b46cffed951..5d52a679330 100644 --- a/cf/commands/version_test.go +++ b/cf/commands/version_test.go @@ -8,7 +8,7 @@ import ( testterm "code.cloudfoundry.org/cli/cf/util/testhelpers/terminal" "code.cloudfoundry.org/cli/cf" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/commandsloader/commands_loader_suite_test.go b/cf/commandsloader/commands_loader_suite_test.go index 4850f44e7a0..4ef049b794a 100644 --- a/cf/commandsloader/commands_loader_suite_test.go +++ b/cf/commandsloader/commands_loader_suite_test.go @@ -1,7 +1,7 @@ package commandsloader_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/commandsloader/commands_loader_test.go b/cf/commandsloader/commands_loader_test.go index 08add8487d2..922a84ed28b 100644 --- a/cf/commandsloader/commands_loader_test.go +++ b/cf/commandsloader/commands_loader_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/cf/commandregistry" "code.cloudfoundry.org/cli/cf/commandsloader" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/config_disk_persistor_test.go b/cf/configuration/config_disk_persistor_test.go index e1a8dd25b11..288486627f5 100644 --- a/cf/configuration/config_disk_persistor_test.go +++ b/cf/configuration/config_disk_persistor_test.go @@ -6,7 +6,7 @@ import ( "os" . "code.cloudfoundry.org/cli/cf/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/configuration_suite_test.go b/cf/configuration/configuration_suite_test.go index c9832177aa4..19e49fb066e 100644 --- a/cf/configuration/configuration_suite_test.go +++ b/cf/configuration/configuration_suite_test.go @@ -1,7 +1,7 @@ package configuration_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/configuration/coreconfig/access_token_test.go b/cf/configuration/coreconfig/access_token_test.go index fea832b1527..d9278e88325 100644 --- a/cf/configuration/coreconfig/access_token_test.go +++ b/cf/configuration/coreconfig/access_token_test.go @@ -2,7 +2,7 @@ package coreconfig_test import ( . "code.cloudfoundry.org/cli/cf/configuration/coreconfig" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/api_config_refresher_test.go b/cf/configuration/coreconfig/api_config_refresher_test.go index 74bf0c4be6a..2f52d74caec 100644 --- a/cf/configuration/coreconfig/api_config_refresher_test.go +++ b/cf/configuration/coreconfig/api_config_refresher_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/cf/configuration/coreconfig/coreconfigfakes" "code.cloudfoundry.org/cli/cf/i18n" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/config_data_test.go b/cf/configuration/coreconfig/config_data_test.go index d1eeb3c3cb4..e3f44d726c9 100644 --- a/cf/configuration/coreconfig/config_data_test.go +++ b/cf/configuration/coreconfig/config_data_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/configuration/coreconfig" "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/config_repository_test.go b/cf/configuration/coreconfig/config_repository_test.go index 9027a811264..d71006e4b0d 100644 --- a/cf/configuration/coreconfig/config_repository_test.go +++ b/cf/configuration/coreconfig/config_repository_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/version" "github.com/blang/semver/v4" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/coreconfig/core_config_suite_test.go b/cf/configuration/coreconfig/core_config_suite_test.go index 238306a5195..9ae20fe8ef3 100644 --- a/cf/configuration/coreconfig/core_config_suite_test.go +++ b/cf/configuration/coreconfig/core_config_suite_test.go @@ -1,7 +1,7 @@ package coreconfig_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/configuration/pluginconfig/plugin_config_test.go b/cf/configuration/pluginconfig/plugin_config_test.go index e7e0703cd54..ffc259781be 100644 --- a/cf/configuration/pluginconfig/plugin_config_test.go +++ b/cf/configuration/pluginconfig/plugin_config_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/plugin" "code.cloudfoundry.org/cli/cf/configuration/configurationfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/configuration/pluginconfig/plugin_suite_test.go b/cf/configuration/pluginconfig/plugin_suite_test.go index e80a11b0ecb..d8297546bfd 100644 --- a/cf/configuration/pluginconfig/plugin_suite_test.go +++ b/cf/configuration/pluginconfig/plugin_suite_test.go @@ -1,7 +1,7 @@ package pluginconfig_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/flagcontext/flag_content_helper_test.go b/cf/flagcontext/flag_content_helper_test.go index 622ed20a6e3..c57324995b9 100644 --- a/cf/flagcontext/flag_content_helper_test.go +++ b/cf/flagcontext/flag_content_helper_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/cf/flagcontext" "code.cloudfoundry.org/gofileutils/fileutils" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/flagcontext/util_suite_test.go b/cf/flagcontext/util_suite_test.go index 5717be16120..3a3e05bbd3b 100644 --- a/cf/flagcontext/util_suite_test.go +++ b/cf/flagcontext/util_suite_test.go @@ -1,7 +1,7 @@ package flagcontext_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/flags/flag_constructor_test.go b/cf/flags/flag_constructor_test.go index c2dc66d9511..fcdd89c2911 100644 --- a/cf/flags/flag_constructor_test.go +++ b/cf/flags/flag_constructor_test.go @@ -2,7 +2,7 @@ package flags_test import ( "code.cloudfoundry.org/cli/cf/flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/flags/flags_suite_test.go b/cf/flags/flags_suite_test.go index 0b3071f62e0..605e48cfa8f 100644 --- a/cf/flags/flags_suite_test.go +++ b/cf/flags/flags_suite_test.go @@ -1,7 +1,7 @@ package flags_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/flags/flags_test.go b/cf/flags/flags_test.go index 14acb4efe9d..1e744afe6b2 100644 --- a/cf/flags/flags_test.go +++ b/cf/flags/flags_test.go @@ -2,7 +2,7 @@ package flags_test import ( "code.cloudfoundry.org/cli/cf/flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/flags/flags_usage_test.go b/cf/flags/flags_usage_test.go index 1badd41b4b0..56851007ecc 100644 --- a/cf/flags/flags_usage_test.go +++ b/cf/flags/flags_usage_test.go @@ -4,7 +4,7 @@ import ( "strings" "code.cloudfoundry.org/cli/cf/flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bools_test.go b/cf/formatters/bools_test.go index 040017ad548..4074e130d58 100644 --- a/cf/formatters/bools_test.go +++ b/cf/formatters/bools_test.go @@ -2,7 +2,7 @@ package formatters_test import ( . "code.cloudfoundry.org/cli/cf/formatters" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/bytes_test.go b/cf/formatters/bytes_test.go index 015986f2e9c..0e486e37a58 100644 --- a/cf/formatters/bytes_test.go +++ b/cf/formatters/bytes_test.go @@ -2,7 +2,7 @@ package formatters_test import ( . "code.cloudfoundry.org/cli/cf/formatters" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/formatters/formatters_suite_test.go b/cf/formatters/formatters_suite_test.go index 9d2236b2726..cfc282f00a2 100644 --- a/cf/formatters/formatters_suite_test.go +++ b/cf/formatters/formatters_suite_test.go @@ -3,7 +3,7 @@ package formatters_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/formatters/memoryLimit_test.go b/cf/formatters/memoryLimit_test.go index ee981c8f500..12e1af7f470 100644 --- a/cf/formatters/memoryLimit_test.go +++ b/cf/formatters/memoryLimit_test.go @@ -2,7 +2,7 @@ package formatters_test import ( . "code.cloudfoundry.org/cli/cf/formatters" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/help/help_suite_test.go b/cf/help/help_suite_test.go index 0ed0de93fad..8c631e6d77c 100644 --- a/cf/help/help_suite_test.go +++ b/cf/help/help_suite_test.go @@ -2,7 +2,7 @@ package help_test import ( "code.cloudfoundry.org/cli/cf/commandsloader" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/help/help_test.go b/cf/help/help_test.go index 8a5b5de1bdd..83a2c269be1 100644 --- a/cf/help/help_test.go +++ b/cf/help/help_test.go @@ -12,7 +12,7 @@ import ( "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" ) diff --git a/cf/i18n/i18n_suite_test.go b/cf/i18n/i18n_suite_test.go index d00c86c0f49..ae75e715081 100644 --- a/cf/i18n/i18n_suite_test.go +++ b/cf/i18n/i18n_suite_test.go @@ -1,7 +1,7 @@ package i18n_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/i18n/locale_test.go b/cf/i18n/locale_test.go index 418d79c91b0..df8781dd85d 100644 --- a/cf/i18n/locale_test.go +++ b/cf/i18n/locale_test.go @@ -3,7 +3,7 @@ package i18n_test import ( "code.cloudfoundry.org/cli/cf/i18n" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/manifest/generate_manifest_test.go b/cf/manifest/generate_manifest_test.go index 2b6d9cfbb4d..78e35599267 100644 --- a/cf/manifest/generate_manifest_test.go +++ b/cf/manifest/generate_manifest_test.go @@ -6,7 +6,7 @@ import ( "bytes" . "code.cloudfoundry.org/cli/cf/manifest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/manifest/manifest_disk_repository_test.go b/cf/manifest/manifest_disk_repository_test.go index 9ae516f1a7b..b59abaf8a5a 100644 --- a/cf/manifest/manifest_disk_repository_test.go +++ b/cf/manifest/manifest_disk_repository_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" . "code.cloudfoundry.org/cli/cf/manifest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/manifest/manifest_suite_test.go b/cf/manifest/manifest_suite_test.go index b5a7e3185c3..3e0fb18b5c2 100644 --- a/cf/manifest/manifest_suite_test.go +++ b/cf/manifest/manifest_suite_test.go @@ -3,7 +3,7 @@ package manifest_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/manifest/manifest_test.go b/cf/manifest/manifest_test.go index 8ea93170e16..aa31a10414d 100644 --- a/cf/manifest/manifest_test.go +++ b/cf/manifest/manifest_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/cf/manifest" "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" diff --git a/cf/models/application_test.go b/cf/models/application_test.go index d0fdb9efb82..ea7ad0ac178 100644 --- a/cf/models/application_test.go +++ b/cf/models/application_test.go @@ -4,7 +4,7 @@ import ( "os" . "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/domain_test.go b/cf/models/domain_test.go index da359bb2af9..251fa439906 100644 --- a/cf/models/domain_test.go +++ b/cf/models/domain_test.go @@ -2,7 +2,7 @@ package models_test import ( . "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/models_suite_test.go b/cf/models/models_suite_test.go index 2d4c6ded196..71cd775e549 100644 --- a/cf/models/models_suite_test.go +++ b/cf/models/models_suite_test.go @@ -1,7 +1,7 @@ package models_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/models/route_summary_test.go b/cf/models/route_summary_test.go index 4b9bd3ce4df..8b69e271aea 100644 --- a/cf/models/route_summary_test.go +++ b/cf/models/route_summary_test.go @@ -3,7 +3,7 @@ package models_test import ( "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/route_test.go b/cf/models/route_test.go index 9bd6b291777..9772ba8ac0c 100644 --- a/cf/models/route_test.go +++ b/cf/models/route_test.go @@ -3,7 +3,7 @@ package models_test import ( "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/service_instance_test.go b/cf/models/service_instance_test.go index a46217b8007..c58f8381287 100644 --- a/cf/models/service_instance_test.go +++ b/cf/models/service_instance_test.go @@ -2,7 +2,7 @@ package models_test import ( . "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/models/service_plan_test.go b/cf/models/service_plan_test.go index e446e93cff0..af9d8510b92 100644 --- a/cf/models/service_plan_test.go +++ b/cf/models/service_plan_test.go @@ -2,7 +2,7 @@ package models_test import ( . "code.cloudfoundry.org/cli/cf/models" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/cloud_controller_gateway_test.go b/cf/net/cloud_controller_gateway_test.go index d61ff7b6c26..cbf72f34db4 100644 --- a/cf/net/cloud_controller_gateway_test.go +++ b/cf/net/cloud_controller_gateway_test.go @@ -15,7 +15,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/gateway_test.go b/cf/net/gateway_test.go index 88c957ca0b2..b1926c950f6 100644 --- a/cf/net/gateway_test.go +++ b/cf/net/gateway_test.go @@ -25,7 +25,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" testnet "code.cloudfoundry.org/cli/cf/util/testhelpers/net" "code.cloudfoundry.org/cli/version" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) diff --git a/cf/net/http_client_test.go b/cf/net/http_client_test.go index 63cb0c7c6cb..e1c5ff5c496 100644 --- a/cf/net/http_client_test.go +++ b/cf/net/http_client_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/cf/errors" . "code.cloudfoundry.org/cli/cf/net" "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "golang.org/x/net/websocket" ) diff --git a/cf/net/net_suite_test.go b/cf/net/net_suite_test.go index 6c7da8e1cfa..8c16c8faf75 100644 --- a/cf/net/net_suite_test.go +++ b/cf/net/net_suite_test.go @@ -3,7 +3,7 @@ package net_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/net/progress_reader_test.go b/cf/net/progress_reader_test.go index 34e37541ade..3f5fecb9518 100644 --- a/cf/net/progress_reader_test.go +++ b/cf/net/progress_reader_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/cf/net" "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/request_dumper_test.go b/cf/net/request_dumper_test.go index 465f61e732d..97ff4513b49 100644 --- a/cf/net/request_dumper_test.go +++ b/cf/net/request_dumper_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/cf/net" "code.cloudfoundry.org/cli/cf/trace" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/routing_api_gateway_test.go b/cf/net/routing_api_gateway_test.go index 92e77ea2f5c..86e1d57c714 100644 --- a/cf/net/routing_api_gateway_test.go +++ b/cf/net/routing_api_gateway_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" "code.cloudfoundry.org/cli/cf/trace/tracefakes" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/uaa_gateway_test.go b/cf/net/uaa_gateway_test.go index 306007f2d72..79b92ca1f97 100644 --- a/cf/net/uaa_gateway_test.go +++ b/cf/net/uaa_gateway_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" "code.cloudfoundry.org/cli/cf/trace/tracefakes" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/net/warnings_collector_test.go b/cf/net/warnings_collector_test.go index 8e62bc1de7b..81d434e9085 100644 --- a/cf/net/warnings_collector_test.go +++ b/cf/net/warnings_collector_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/cf/net" "code.cloudfoundry.org/cli/cf/net/netfakes" "code.cloudfoundry.org/cli/cf/terminal/terminalfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/api_endpoint_test.go b/cf/requirements/api_endpoint_test.go index 32ff9d12d10..dd8ecd43f6d 100644 --- a/cf/requirements/api_endpoint_test.go +++ b/cf/requirements/api_endpoint_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/configuration/coreconfig" . "code.cloudfoundry.org/cli/cf/requirements" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/application_test.go b/cf/requirements/application_test.go index 7287bcda01a..de87d9fe455 100644 --- a/cf/requirements/application_test.go +++ b/cf/requirements/application_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/errors" "code.cloudfoundry.org/cli/cf/models" . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/buildpack_test.go b/cf/requirements/buildpack_test.go index f9128a0a1f7..b40e60e323c 100644 --- a/cf/requirements/buildpack_test.go +++ b/cf/requirements/buildpack_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/apifakes" "code.cloudfoundry.org/cli/cf/models" . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/config_refreshing_requirement_test.go b/cf/requirements/config_refreshing_requirement_test.go index 4bb706a6a35..3421504cc20 100644 --- a/cf/requirements/config_refreshing_requirement_test.go +++ b/cf/requirements/config_refreshing_requirement_test.go @@ -6,7 +6,7 @@ import ( "errors" "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/dea_application_test.go b/cf/requirements/dea_application_test.go index b3feee872d2..bc6b6122239 100644 --- a/cf/requirements/dea_application_test.go +++ b/cf/requirements/dea_application_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/applications/applicationsfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/domain_test.go b/cf/requirements/domain_test.go index c855b44dca8..20d31fc8871 100644 --- a/cf/requirements/domain_test.go +++ b/cf/requirements/domain_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" . "code.cloudfoundry.org/cli/cf/requirements" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/login_test.go b/cf/requirements/login_test.go index 0a8b19f6df6..68e18fd0a94 100644 --- a/cf/requirements/login_test.go +++ b/cf/requirements/login_test.go @@ -3,7 +3,7 @@ package requirements_test import ( "code.cloudfoundry.org/cli/cf/configuration/coreconfig" . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" diff --git a/cf/requirements/max_api_version_test.go b/cf/requirements/max_api_version_test.go index f02bcb5898e..00d0465b348 100644 --- a/cf/requirements/max_api_version_test.go +++ b/cf/requirements/max_api_version_test.go @@ -7,7 +7,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/min_api_version_test.go b/cf/requirements/min_api_version_test.go index 0a5219f141d..4041ed37200 100644 --- a/cf/requirements/min_api_version_test.go +++ b/cf/requirements/min_api_version_test.go @@ -7,7 +7,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/number_arguments_test.go b/cf/requirements/number_arguments_test.go index 8725a373c0a..6e1e8e82fb8 100644 --- a/cf/requirements/number_arguments_test.go +++ b/cf/requirements/number_arguments_test.go @@ -3,7 +3,7 @@ package requirements_test import ( . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/organization_test.go b/cf/requirements/organization_test.go index 22a0580200f..6830194f6ff 100644 --- a/cf/requirements/organization_test.go +++ b/cf/requirements/organization_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/organizations/organizationsfakes" "code.cloudfoundry.org/cli/cf/models" . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/requirements_suite_test.go b/cf/requirements/requirements_suite_test.go index 7d694ce9fff..410c11929dc 100644 --- a/cf/requirements/requirements_suite_test.go +++ b/cf/requirements/requirements_suite_test.go @@ -3,7 +3,7 @@ package requirements_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/requirements/requirements_test.go b/cf/requirements/requirements_test.go index 727da97f6fe..bda87e4e11b 100644 --- a/cf/requirements/requirements_test.go +++ b/cf/requirements/requirements_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/requirements/requirementsfakes" "errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/service_instance_test.go b/cf/requirements/service_instance_test.go index 59cad62514a..da164134082 100644 --- a/cf/requirements/service_instance_test.go +++ b/cf/requirements/service_instance_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/errors" "code.cloudfoundry.org/cli/cf/models" . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/space_test.go b/cf/requirements/space_test.go index 59f8b37bc9a..99cb6a34c85 100644 --- a/cf/requirements/space_test.go +++ b/cf/requirements/space_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/spaces/spacesfakes" "code.cloudfoundry.org/cli/cf/models" . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/targeted_organization_test.go b/cf/requirements/targeted_organization_test.go index a441477e9fd..6ffa2bde52d 100644 --- a/cf/requirements/targeted_organization_test.go +++ b/cf/requirements/targeted_organization_test.go @@ -7,7 +7,7 @@ import ( testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/targeted_space_test.go b/cf/requirements/targeted_space_test.go index 97826b03fd3..09e5ecae3dd 100644 --- a/cf/requirements/targeted_space_test.go +++ b/cf/requirements/targeted_space_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/models" . "code.cloudfoundry.org/cli/cf/requirements" testconfig "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/unsupported_legacy_flag_test.go b/cf/requirements/unsupported_legacy_flag_test.go index 072ae4a8ddd..1cd17b8b50e 100644 --- a/cf/requirements/unsupported_legacy_flag_test.go +++ b/cf/requirements/unsupported_legacy_flag_test.go @@ -3,7 +3,7 @@ package requirements_test import ( "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/usage_requirement_test.go b/cf/requirements/usage_requirement_test.go index 44300021683..67bfe9d7708 100644 --- a/cf/requirements/usage_requirement_test.go +++ b/cf/requirements/usage_requirement_test.go @@ -2,7 +2,7 @@ package requirements_test import ( . "code.cloudfoundry.org/cli/cf/requirements" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/requirements/user_test.go b/cf/requirements/user_test.go index cacd18a2a0e..cc3956c1685 100644 --- a/cf/requirements/user_test.go +++ b/cf/requirements/user_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/cf/api/apifakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/ssh/options/options_suite_test.go b/cf/ssh/options/options_suite_test.go index a928cbe1095..890967e4ea1 100644 --- a/cf/ssh/options/options_suite_test.go +++ b/cf/ssh/options/options_suite_test.go @@ -1,7 +1,7 @@ package options_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/ssh/options/ssh_options_test.go b/cf/ssh/options/ssh_options_test.go index 4f77b1dd700..914e3fcf359 100644 --- a/cf/ssh/options/ssh_options_test.go +++ b/cf/ssh/options/ssh_options_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/cf/flags" "code.cloudfoundry.org/cli/cf/ssh/options" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/ssh/ssh_suite_test.go b/cf/ssh/ssh_suite_test.go index d1e7ac87141..89e007eb471 100644 --- a/cf/ssh/ssh_suite_test.go +++ b/cf/ssh/ssh_suite_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "path/filepath" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "golang.org/x/crypto/ssh" diff --git a/cf/ssh/ssh_test.go b/cf/ssh/ssh_test.go index 60f6dad838b..624979e57ae 100644 --- a/cf/ssh/ssh_test.go +++ b/cf/ssh/ssh_test.go @@ -28,12 +28,12 @@ import ( "code.cloudfoundry.org/diego-ssh/test_helpers/fake_io" "code.cloudfoundry.org/diego-ssh/test_helpers/fake_net" "code.cloudfoundry.org/diego-ssh/test_helpers/fake_ssh" - "code.cloudfoundry.org/lager/lagertest" - "github.com/kr/pty" + "code.cloudfoundry.org/lager/v3/lagertest" + "github.com/creack/pty" "github.com/moby/term" "golang.org/x/crypto/ssh" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -889,7 +889,7 @@ var _ = Describe("SSH", func() { fakeLocalListener = &fake_net.FakeListener{} fakeLocalListener.AcceptReturns(nil, errors.New("Not Accepting Connections")) - echoServer = server.NewServer(logger.Session("echo"), "", echoHandler) + echoServer = server.NewServer(logger.Session("echo"), "", echoHandler, 500*time.Millisecond) echoServer.SetListener(echoListener) go echoServer.Serve() diff --git a/cf/ssh/terminal/helper_test.go b/cf/ssh/terminal/helper_test.go index 758962b1a2e..9c243435407 100644 --- a/cf/ssh/terminal/helper_test.go +++ b/cf/ssh/terminal/helper_test.go @@ -3,7 +3,7 @@ package terminal_test import ( "code.cloudfoundry.org/cli/cf/ssh/terminal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/ssh/terminal/terminal_suite_test.go b/cf/ssh/terminal/terminal_suite_test.go index 7ae041f713c..6707582b58a 100644 --- a/cf/ssh/terminal/terminal_suite_test.go +++ b/cf/ssh/terminal/terminal_suite_test.go @@ -1,7 +1,7 @@ package terminal_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/terminal/color_test.go b/cf/terminal/color_test.go index 8e6aadc86af..a69a675b6bb 100644 --- a/cf/terminal/color_test.go +++ b/cf/terminal/color_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/terminal" "github.com/fatih/color" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/terminal/table_test.go b/cf/terminal/table_test.go index d893d7a3b4d..542c1e7bcea 100644 --- a/cf/terminal/table_test.go +++ b/cf/terminal/table_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/terminal" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/terminal/tee_printer_test.go b/cf/terminal/tee_printer_test.go index 17e1dca58ed..da6d70eb764 100644 --- a/cf/terminal/tee_printer_test.go +++ b/cf/terminal/tee_printer_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/terminal" io_helpers "code.cloudfoundry.org/cli/cf/util/testhelpers/io" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" ) diff --git a/cf/terminal/terminal_suite_test.go b/cf/terminal/terminal_suite_test.go index 056b2718c86..611d5c1b14a 100644 --- a/cf/terminal/terminal_suite_test.go +++ b/cf/terminal/terminal_suite_test.go @@ -3,7 +3,7 @@ package terminal_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/terminal/ui_test.go b/cf/terminal/ui_test.go index e3bfea5ebf3..33e803c49b4 100644 --- a/cf/terminal/ui_test.go +++ b/cf/terminal/ui_test.go @@ -18,7 +18,7 @@ import ( . "code.cloudfoundry.org/cli/cf/terminal" "code.cloudfoundry.org/cli/cf/trace" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" ) diff --git a/cf/trace/combined_printer_test.go b/cf/trace/combined_printer_test.go index 0fea6714a42..33d4dc420da 100644 --- a/cf/trace/combined_printer_test.go +++ b/cf/trace/combined_printer_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/cf/trace/tracefakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/trace/logger_provider_test.go b/cf/trace/logger_provider_test.go index 9a3271446ff..2e1198fd443 100644 --- a/cf/trace/logger_provider_test.go +++ b/cf/trace/logger_provider_test.go @@ -10,7 +10,7 @@ import ( "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" ) diff --git a/cf/trace/trace_suite_test.go b/cf/trace/trace_suite_test.go index a874d42e876..c8c3731a11c 100644 --- a/cf/trace/trace_suite_test.go +++ b/cf/trace/trace_suite_test.go @@ -3,7 +3,7 @@ package trace_test import ( "code.cloudfoundry.org/cli/cf/i18n" "code.cloudfoundry.org/cli/cf/util/testhelpers/configuration" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/trace/trace_test.go b/cf/trace/trace_test.go index 5b7f38f74d5..3d5aa9f628a 100644 --- a/cf/trace/trace_test.go +++ b/cf/trace/trace_test.go @@ -2,7 +2,7 @@ package trace_test import ( . "code.cloudfoundry.org/cli/cf/trace" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/uihelpers/tags_parser_test.go b/cf/uihelpers/tags_parser_test.go index 5c11de8822a..11e01e09f2d 100644 --- a/cf/uihelpers/tags_parser_test.go +++ b/cf/uihelpers/tags_parser_test.go @@ -2,7 +2,7 @@ package uihelpers_test import ( . "code.cloudfoundry.org/cli/cf/uihelpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/uihelpers/ui_helpers_suite_test.go b/cf/uihelpers/ui_helpers_suite_test.go index d2c3d75d4c8..5c35f8774e7 100644 --- a/cf/uihelpers/ui_helpers_suite_test.go +++ b/cf/uihelpers/ui_helpers_suite_test.go @@ -1,7 +1,7 @@ package uihelpers_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/util/downloader/file_download_test.go b/cf/util/downloader/file_download_test.go index 64fb2a4e6d9..1cf3a440c8a 100644 --- a/cf/util/downloader/file_download_test.go +++ b/cf/util/downloader/file_download_test.go @@ -10,7 +10,7 @@ import ( "github.com/onsi/gomega/ghttp" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/downloader/fileutils_suite_test.go b/cf/util/downloader/fileutils_suite_test.go index 4bcde26ee9b..e554aa37a84 100644 --- a/cf/util/downloader/fileutils_suite_test.go +++ b/cf/util/downloader/fileutils_suite_test.go @@ -1,7 +1,7 @@ package downloader_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/util/glob/glob_test.go b/cf/util/glob/glob_test.go index 41e54b33b90..d80a31a9002 100644 --- a/cf/util/glob/glob_test.go +++ b/cf/util/glob/glob_test.go @@ -3,7 +3,7 @@ package glob import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/json/json_parser_test.go b/cf/util/json/json_parser_test.go index d77d12ef657..2a79a289ca2 100644 --- a/cf/util/json/json_parser_test.go +++ b/cf/util/json/json_parser_test.go @@ -5,7 +5,7 @@ import ( "os" "code.cloudfoundry.org/cli/cf/util/json" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/json/json_suite_test.go b/cf/util/json/json_suite_test.go index 9ea25dd8a26..03b6108b0b2 100644 --- a/cf/util/json/json_suite_test.go +++ b/cf/util/json/json_suite_test.go @@ -1,7 +1,7 @@ package json_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/util/spellcheck/spellcheck_suite_test.go b/cf/util/spellcheck/spellcheck_suite_test.go index d3441a7c1f0..b1a60fd89c5 100644 --- a/cf/util/spellcheck/spellcheck_suite_test.go +++ b/cf/util/spellcheck/spellcheck_suite_test.go @@ -1,7 +1,7 @@ package spellcheck_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/util/spellcheck/spellcheck_test.go b/cf/util/spellcheck/spellcheck_test.go index f8c1abfbe5b..40e4cb8cc21 100644 --- a/cf/util/spellcheck/spellcheck_test.go +++ b/cf/util/spellcheck/spellcheck_test.go @@ -3,7 +3,7 @@ package spellcheck_test import ( . "code.cloudfoundry.org/cli/cf/util/spellcheck" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/io/io_test.go b/cf/util/testhelpers/io/io_test.go index da4c78b6e6f..505ee413ed6 100644 --- a/cf/util/testhelpers/io/io_test.go +++ b/cf/util/testhelpers/io/io_test.go @@ -5,7 +5,7 @@ import ( "strings" . "code.cloudfoundry.org/cli/cf/util/testhelpers/io" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/io/suite_test.go b/cf/util/testhelpers/io/suite_test.go index e7f78b3be80..9c6d911db62 100644 --- a/cf/util/testhelpers/io/suite_test.go +++ b/cf/util/testhelpers/io/suite_test.go @@ -1,7 +1,7 @@ package io_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/util/testhelpers/matchers/be_in_display_order_test.go b/cf/util/testhelpers/matchers/be_in_display_order_test.go index 0a4e65e4a12..168ddd8ec67 100644 --- a/cf/util/testhelpers/matchers/be_in_display_order_test.go +++ b/cf/util/testhelpers/matchers/be_in_display_order_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/contain_element_times_test.go b/cf/util/testhelpers/matchers/contain_element_times_test.go index d862f0c73ab..3d9ab6b1e99 100644 --- a/cf/util/testhelpers/matchers/contain_element_times_test.go +++ b/cf/util/testhelpers/matchers/contain_element_times_test.go @@ -2,7 +2,7 @@ package matchers_test import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/contain_elements_in_order_test.go b/cf/util/testhelpers/matchers/contain_elements_in_order_test.go index 9cba9e8ad8a..55f3363c1bf 100644 --- a/cf/util/testhelpers/matchers/contain_elements_in_order_test.go +++ b/cf/util/testhelpers/matchers/contain_elements_in_order_test.go @@ -2,7 +2,7 @@ package matchers_test import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/have_type_of_test.go b/cf/util/testhelpers/matchers/have_type_of_test.go index e9e34765738..a058e4ea6e2 100644 --- a/cf/util/testhelpers/matchers/have_type_of_test.go +++ b/cf/util/testhelpers/matchers/have_type_of_test.go @@ -2,7 +2,7 @@ package matchers_test import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/match_func_name_test.go b/cf/util/testhelpers/matchers/match_func_name_test.go index c5b6e942c87..723ebdc964c 100644 --- a/cf/util/testhelpers/matchers/match_func_name_test.go +++ b/cf/util/testhelpers/matchers/match_func_name_test.go @@ -4,7 +4,7 @@ import ( "errors" . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/matchers/match_path_test.go b/cf/util/testhelpers/matchers/match_path_test.go index 03146318811..aaaf2ec90cc 100644 --- a/cf/util/testhelpers/matchers/match_path_test.go +++ b/cf/util/testhelpers/matchers/match_path_test.go @@ -3,7 +3,7 @@ package matchers_test import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "errors" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" . "github.com/onsi/gomega" "io/ioutil" diff --git a/cf/util/testhelpers/matchers/matchers_suite_test.go b/cf/util/testhelpers/matchers/matchers_suite_test.go index 4d11b6a2147..e85892796fa 100644 --- a/cf/util/testhelpers/matchers/matchers_suite_test.go +++ b/cf/util/testhelpers/matchers/matchers_suite_test.go @@ -1,7 +1,7 @@ package matchers_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/cf/util/testhelpers/net/request_matcher.go b/cf/util/testhelpers/net/request_matcher.go index 84950c2570e..e4d5b1ad5e4 100644 --- a/cf/util/testhelpers/net/request_matcher.go +++ b/cf/util/testhelpers/net/request_matcher.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cf/util/testhelpers/net/server.go b/cf/util/testhelpers/net/server.go index 09ce8e811c3..7f31eeeabc6 100644 --- a/cf/util/testhelpers/net/server.go +++ b/cf/util/testhelpers/net/server.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/onsi/ginkgo" + "github.com/onsi/ginkgo/v2" ) type TestRequest struct { diff --git a/command/api_version_warning_test.go b/command/api_version_warning_test.go index 04cf3a21e6b..c8cd96b58fb 100644 --- a/command/api_version_warning_test.go +++ b/command/api_version_warning_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/version" "github.com/blang/semver/v4" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/command_suite_test.go b/command/command_suite_test.go index 33fb4da90fb..af257e39a12 100644 --- a/command/command_suite_test.go +++ b/command/command_suite_test.go @@ -1,7 +1,7 @@ package command_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/command/common/command_list_v7_test.go b/command/common/command_list_v7_test.go index 50acdce0ec4..23bfe58082e 100644 --- a/command/common/command_list_v7_test.go +++ b/command/common/command_list_v7_test.go @@ -2,7 +2,7 @@ package common_test import ( . "code.cloudfoundry.org/cli/command/common" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/common_suite_test.go b/command/common/common_suite_test.go index 32e4b98071d..4f17bfab8ae 100644 --- a/command/common/common_suite_test.go +++ b/command/common/common_suite_test.go @@ -1,7 +1,7 @@ package common_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/command/common/install_plugin_command_test.go b/command/common/install_plugin_command_test.go index 9e29befb9e6..24880301f35 100644 --- a/command/common/install_plugin_command_test.go +++ b/command/common/install_plugin_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/common/install_plugin_from_repo_command_test.go b/command/common/install_plugin_from_repo_command_test.go index 11fe6bd9e80..b9e61609492 100644 --- a/command/common/install_plugin_from_repo_command_test.go +++ b/command/common/install_plugin_from_repo_command_test.go @@ -21,8 +21,8 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/common/internal/help_all_display_test.go b/command/common/internal/help_all_display_test.go index ee812d6d1cf..bb93ffb9ce9 100644 --- a/command/common/internal/help_all_display_test.go +++ b/command/common/internal/help_all_display_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/command/common" "code.cloudfoundry.org/cli/command/common/internal" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/internal/internal_suite_test.go b/command/common/internal/internal_suite_test.go index 86d6b32f524..b38fb2bd915 100644 --- a/command/common/internal/internal_suite_test.go +++ b/command/common/internal/internal_suite_test.go @@ -3,7 +3,7 @@ package internal_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/common/version_command_test.go b/command/common/version_command_test.go index a6f3b6d8b34..9db08671ad9 100644 --- a/command/common/version_command_test.go +++ b/command/common/version_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/command/common" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/flag/app_type_test.go b/command/flag/app_type_test.go index cfd3a36b904..cceaba6bea8 100644 --- a/command/flag/app_type_test.go +++ b/command/flag/app_type_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/binding_name_test.go b/command/flag/binding_name_test.go index 0a01d0b95a6..6bba5ef984a 100644 --- a/command/flag/binding_name_test.go +++ b/command/flag/binding_name_test.go @@ -3,7 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/buildpack_test.go b/command/flag/buildpack_test.go index 11ab0374d78..2910227b642 100644 --- a/command/flag/buildpack_test.go +++ b/command/flag/buildpack_test.go @@ -2,7 +2,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/color_test.go b/command/flag/color_test.go index 104975e5fa8..2a007ba6207 100644 --- a/command/flag/color_test.go +++ b/command/flag/color_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/command_test.go b/command/flag/command_test.go index dd5a2f54971..522e43c56fb 100644 --- a/command/flag/command_test.go +++ b/command/flag/command_test.go @@ -2,7 +2,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/credentials_or_json_test.go b/command/flag/credentials_or_json_test.go index f962d8b1a97..aff6b28cf1b 100644 --- a/command/flag/credentials_or_json_test.go +++ b/command/flag/credentials_or_json_test.go @@ -6,8 +6,8 @@ import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/deployment_strategy_test.go b/command/flag/deployment_strategy_test.go index 78846b11c59..d8f8ad229a5 100644 --- a/command/flag/deployment_strategy_test.go +++ b/command/flag/deployment_strategy_test.go @@ -4,8 +4,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/docker_test.go b/command/flag/docker_test.go index 510071e0741..ddfb59c896f 100644 --- a/command/flag/docker_test.go +++ b/command/flag/docker_test.go @@ -3,7 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/droplet_test.go b/command/flag/droplet_test.go index 0fd86977c16..1d3f2562bbd 100644 --- a/command/flag/droplet_test.go +++ b/command/flag/droplet_test.go @@ -2,7 +2,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/environment_variable_test.go b/command/flag/environment_variable_test.go index 803316fe002..30249af3454 100644 --- a/command/flag/environment_variable_test.go +++ b/command/flag/environment_variable_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/flag_suite_test.go b/command/flag/flag_suite_test.go index 7254810be22..9bed6008825 100644 --- a/command/flag/flag_suite_test.go +++ b/command/flag/flag_suite_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/command/flag/health_check_type_test.go b/command/flag/health_check_type_test.go index f96ab6c0e44..c381233924d 100644 --- a/command/flag/health_check_type_test.go +++ b/command/flag/health_check_type_test.go @@ -4,8 +4,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/health_check_type_with_deprecated_value_test.go b/command/flag/health_check_type_with_deprecated_value_test.go index 7645fe0e424..21fbb122385 100644 --- a/command/flag/health_check_type_with_deprecated_value_test.go +++ b/command/flag/health_check_type_with_deprecated_value_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/instances_test.go b/command/flag/instances_test.go index d93af82d32b..10dd691de6c 100644 --- a/command/flag/instances_test.go +++ b/command/flag/instances_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/command/flag" "code.cloudfoundry.org/cli/types" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/integer_limit_test.go b/command/flag/integer_limit_test.go index 1b84afe5c15..9fae1ecc6b1 100644 --- a/command/flag/integer_limit_test.go +++ b/command/flag/integer_limit_test.go @@ -3,7 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/locale_test.go b/command/flag/locale_test.go index 309ba7c98dd..5209068bdae 100644 --- a/command/flag/locale_test.go +++ b/command/flag/locale_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/megabytes_test.go b/command/flag/megabytes_test.go index 385efc921f4..6a43936dd3e 100644 --- a/command/flag/megabytes_test.go +++ b/command/flag/megabytes_test.go @@ -3,7 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/memory_with_unlimited_test.go b/command/flag/memory_with_unlimited_test.go index 65c4e92d939..c92664894f2 100644 --- a/command/flag/memory_with_unlimited_test.go +++ b/command/flag/memory_with_unlimited_test.go @@ -3,7 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/network_port_test.go b/command/flag/network_port_test.go index 03454f2d8e8..5f709893e92 100644 --- a/command/flag/network_port_test.go +++ b/command/flag/network_port_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/network_protocol_test.go b/command/flag/network_protocol_test.go index 3d11aa4982b..ae7e99135e1 100644 --- a/command/flag/network_protocol_test.go +++ b/command/flag/network_protocol_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/optional_string_test.go b/command/flag/optional_string_test.go index 528178ad2af..971337a7bcc 100644 --- a/command/flag/optional_string_test.go +++ b/command/flag/optional_string_test.go @@ -2,7 +2,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/org_role_test.go b/command/flag/org_role_test.go index 4c8402c824e..6419d6ef93e 100644 --- a/command/flag/org_role_test.go +++ b/command/flag/org_role_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/path_test.go b/command/flag/path_test.go index 7bfd56ccde8..549c1239588 100644 --- a/command/flag/path_test.go +++ b/command/flag/path_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/port_test.go b/command/flag/port_test.go index c2921565359..3a4c6e182f7 100644 --- a/command/flag/port_test.go +++ b/command/flag/port_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/command/flag" "code.cloudfoundry.org/cli/types" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/positive_integer_test.go b/command/flag/positive_integer_test.go index 256a4201bac..9154fb9ec99 100644 --- a/command/flag/positive_integer_test.go +++ b/command/flag/positive_integer_test.go @@ -2,7 +2,7 @@ package flag_test import ( flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/command/flag" diff --git a/command/flag/revision_test.go b/command/flag/revision_test.go index f6c1993ce88..9fb898ec140 100644 --- a/command/flag/revision_test.go +++ b/command/flag/revision_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/command/flag" "code.cloudfoundry.org/cli/types" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/route_path_test.go b/command/flag/route_path_test.go index 60766c2fc0c..cbdc440c3f2 100644 --- a/command/flag/route_path_test.go +++ b/command/flag/route_path_test.go @@ -2,7 +2,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/security_group_lifecycle_test.go b/command/flag/security_group_lifecycle_test.go index 570396acd70..1f7a61d075f 100644 --- a/command/flag/security_group_lifecycle_test.go +++ b/command/flag/security_group_lifecycle_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/space_role_test.go b/command/flag/space_role_test.go index 5c3108638d3..2f355dc5493 100644 --- a/command/flag/space_role_test.go +++ b/command/flag/space_role_test.go @@ -3,8 +3,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/ssh_port_forwarding_test.go b/command/flag/ssh_port_forwarding_test.go index cac98d2a0e1..3d9c79708a0 100644 --- a/command/flag/ssh_port_forwarding_test.go +++ b/command/flag/ssh_port_forwarding_test.go @@ -5,8 +5,8 @@ import ( . "code.cloudfoundry.org/cli/command/flag" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/tags_test.go b/command/flag/tags_test.go index 8d2f1120623..71a133cff39 100644 --- a/command/flag/tags_test.go +++ b/command/flag/tags_test.go @@ -2,7 +2,7 @@ package flag_test import ( . "code.cloudfoundry.org/cli/command/flag" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/flag/timeout_test.go b/command/flag/timeout_test.go index a24caadb81e..82245063c24 100644 --- a/command/flag/timeout_test.go +++ b/command/flag/timeout_test.go @@ -2,7 +2,7 @@ package flag_test import ( flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/command/flag" diff --git a/command/minimum_version_check_test.go b/command/minimum_version_check_test.go index 8ae9fc914d2..61aaa94450b 100644 --- a/command/minimum_version_check_test.go +++ b/command/minimum_version_check_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/version" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/plugin/add_plugin_repo_command_test.go b/command/plugin/add_plugin_repo_command_test.go index 81851357b9a..1197642d203 100644 --- a/command/plugin/add_plugin_repo_command_test.go +++ b/command/plugin/add_plugin_repo_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/command/plugin" "code.cloudfoundry.org/cli/command/plugin/pluginfakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/plugin/plugin_suite_test.go b/command/plugin/plugin_suite_test.go index ff9b49859d0..78b837b48ed 100644 --- a/command/plugin/plugin_suite_test.go +++ b/command/plugin/plugin_suite_test.go @@ -1,7 +1,7 @@ package plugin_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/command/plugin/plugins_command_test.go b/command/plugin/plugins_command_test.go index ac522ad244a..699abd804ef 100644 --- a/command/plugin/plugins_command_test.go +++ b/command/plugin/plugins_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/plugin/uninstall_plugin_command_test.go b/command/plugin/uninstall_plugin_command_test.go index 3438c35b71d..ca15844dff2 100644 --- a/command/plugin/uninstall_plugin_command_test.go +++ b/command/plugin/uninstall_plugin_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/translatableerror/convert_to_translatable_error_test.go b/command/translatableerror/convert_to_translatable_error_test.go index da458cf7274..94f70dd751c 100644 --- a/command/translatableerror/convert_to_translatable_error_test.go +++ b/command/translatableerror/convert_to_translatable_error_test.go @@ -14,8 +14,8 @@ import ( "code.cloudfoundry.org/cli/util/download" "code.cloudfoundry.org/cli/util/manifest" "code.cloudfoundry.org/cli/util/v6manifestparser" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/minimum_cf_api_version_not_met_error_test.go b/command/translatableerror/minimum_cf_api_version_not_met_error_test.go index ff6ba6e431b..8d8e06416b5 100644 --- a/command/translatableerror/minimum_cf_api_version_not_met_error_test.go +++ b/command/translatableerror/minimum_cf_api_version_not_met_error_test.go @@ -3,7 +3,7 @@ package translatableerror_test import ( . "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/minimum_cli_version_not_met_error_test.go b/command/translatableerror/minimum_cli_version_not_met_error_test.go index 03dd6b4e229..a237531625f 100644 --- a/command/translatableerror/minimum_cli_version_not_met_error_test.go +++ b/command/translatableerror/minimum_cli_version_not_met_error_test.go @@ -3,7 +3,7 @@ package translatableerror_test import ( . "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/minimum_uaa_api_version_not_met_error_test.go b/command/translatableerror/minimum_uaa_api_version_not_met_error_test.go index 2190e74b05c..f79c98834be 100644 --- a/command/translatableerror/minimum_uaa_api_version_not_met_error_test.go +++ b/command/translatableerror/minimum_uaa_api_version_not_met_error_test.go @@ -3,7 +3,7 @@ package translatableerror_test import ( . "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/missing_credential_error_test.go b/command/translatableerror/missing_credential_error_test.go index a3225d84150..1353cd4f9ee 100644 --- a/command/translatableerror/missing_credential_error_test.go +++ b/command/translatableerror/missing_credential_error_test.go @@ -3,7 +3,7 @@ package translatableerror_test import ( . "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/service_instance_not_shareable_error_test.go b/command/translatableerror/service_instance_not_shareable_error_test.go index cf0149f5473..6394d787ee1 100644 --- a/command/translatableerror/service_instance_not_shareable_error_test.go +++ b/command/translatableerror/service_instance_not_shareable_error_test.go @@ -2,7 +2,7 @@ package translatableerror_test import ( . "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/service_plan_not_found_error_test.go b/command/translatableerror/service_plan_not_found_error_test.go index da9406b7f60..989347828fa 100644 --- a/command/translatableerror/service_plan_not_found_error_test.go +++ b/command/translatableerror/service_plan_not_found_error_test.go @@ -2,7 +2,7 @@ package translatableerror_test import ( "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/staging_timeout_error_test.go b/command/translatableerror/staging_timeout_error_test.go index dad11893237..0ce31dd5f1e 100644 --- a/command/translatableerror/staging_timeout_error_test.go +++ b/command/translatableerror/staging_timeout_error_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/tip_decorator_error_test.go b/command/translatableerror/tip_decorator_error_test.go index 3663c30f91e..a8792e81093 100644 --- a/command/translatableerror/tip_decorator_error_test.go +++ b/command/translatableerror/tip_decorator_error_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/command/translatableerror/translatableerrorfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/translatableerror_suite_test.go b/command/translatableerror/translatableerror_suite_test.go index 545e994c716..0654435ad3b 100644 --- a/command/translatableerror/translatableerror_suite_test.go +++ b/command/translatableerror/translatableerror_suite_test.go @@ -1,7 +1,7 @@ package translatableerror_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/command/translatableerror/translate_test.go b/command/translatableerror/translate_test.go index 773b1800a48..cbfc8c3bb7c 100644 --- a/command/translatableerror/translate_test.go +++ b/command/translatableerror/translate_test.go @@ -7,8 +7,7 @@ import ( . "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/translatableerror/unauthorized_error_test.go b/command/translatableerror/unauthorized_error_test.go index d49828de127..339d350d1be 100644 --- a/command/translatableerror/unauthorized_error_test.go +++ b/command/translatableerror/unauthorized_error_test.go @@ -3,8 +3,7 @@ package translatableerror_test import ( . "code.cloudfoundry.org/cli/command/translatableerror" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v6/bind_service_command_test.go b/command/v6/bind_service_command_test.go index 7bb98970e1d..5d9c7da55f0 100644 --- a/command/v6/bind_service_command_test.go +++ b/command/v6/bind_service_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/create_service_command_test.go b/command/v6/create_service_command_test.go index 295ce0b848c..1b1c21c6a10 100644 --- a/command/v6/create_service_command_test.go +++ b/command/v6/create_service_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/create_service_key_command_test.go b/command/v6/create_service_key_command_test.go index 9f37808a2ae..749da08003f 100644 --- a/command/v6/create_service_key_command_test.go +++ b/command/v6/create_service_key_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/service_command_test.go b/command/v6/service_command_test.go index e7a8f7e6294..3977387813d 100644 --- a/command/v6/service_command_test.go +++ b/command/v6/service_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/services_command_test.go b/command/v6/services_command_test.go index eb7eb42acac..c70c2435b3d 100644 --- a/command/v6/services_command_test.go +++ b/command/v6/services_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/share_service_command_test.go b/command/v6/share_service_command_test.go index 3819abaed2f..f41f2a6cf5c 100644 --- a/command/v6/share_service_command_test.go +++ b/command/v6/share_service_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/shared/app_summary_displayer_refactored_test.go b/command/v6/shared/app_summary_displayer_refactored_test.go index 09a58b85424..2f17fbed320 100644 --- a/command/v6/shared/app_summary_displayer_refactored_test.go +++ b/command/v6/shared/app_summary_displayer_refactored_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/shared/app_summary_displayer_test.go b/command/v6/shared/app_summary_displayer_test.go index e72a5a4e27f..e98ff194a88 100644 --- a/command/v6/shared/app_summary_displayer_test.go +++ b/command/v6/shared/app_summary_displayer_test.go @@ -16,7 +16,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/shared/get_application_changes_test.go b/command/v6/shared/get_application_changes_test.go index f5aba8b4477..b93e4bdf626 100644 --- a/command/v6/shared/get_application_changes_test.go +++ b/command/v6/shared/get_application_changes_test.go @@ -9,8 +9,7 @@ import ( . "code.cloudfoundry.org/cli/command/v6/shared" "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -220,7 +219,7 @@ var _ = Describe("GetApplicationChanges", func() { })) }, Entry("new app with disk_quota specified", 0, 200, "", "200M"), - Entry("existing disk_quota with no disk_quota specified", 100, 0, "100M", "0"), + Entry("existing disk_quota with no disk_quota specified", 100, 0, "100M", "0B"), Entry("existing disk_quota with new disk_quota specified", 100, 200, "100M", "200M"), ) }) @@ -359,7 +358,7 @@ var _ = Describe("GetApplicationChanges", func() { })) }, Entry("new app with memory specified", 0, 200, "", "200M"), - Entry("existing memory with no memory specified", 100, 0, "100M", "0"), + Entry("existing memory with no memory specified", 100, 0, "100M", "0B"), Entry("existing memory with new memory specified", 100, 200, "100M", "200M"), ) }) diff --git a/command/v6/shared/new_clients_test.go b/command/v6/shared/new_clients_test.go index c15897b92d7..dea27448924 100644 --- a/command/v6/shared/new_clients_test.go +++ b/command/v6/shared/new_clients_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/command/v6/shared" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/ghttp" diff --git a/command/v6/shared/new_networking_client_test.go b/command/v6/shared/new_networking_client_test.go index 01f2f0da5f3..e7ee4170222 100644 --- a/command/v6/shared/new_networking_client_test.go +++ b/command/v6/shared/new_networking_client_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/uaa" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/shared/new_v3_based_clients_test.go b/command/v6/shared/new_v3_based_clients_test.go index 3269c80ecd7..bcdcba19ff6 100644 --- a/command/v6/shared/new_v3_based_clients_test.go +++ b/command/v6/shared/new_v3_based_clients_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/command/v6/shared" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/ghttp" diff --git a/command/v6/shared/noaa_client_test.go b/command/v6/shared/noaa_client_test.go index 2af5ed969cb..9a3fbef491d 100644 --- a/command/v6/shared/noaa_client_test.go +++ b/command/v6/shared/noaa_client_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/command/commandfakes" "code.cloudfoundry.org/cli/command/v6/shared" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v6/shared/poll_start_test.go b/command/v6/shared/poll_start_test.go index 60f490543fc..a53569b0184 100644 --- a/command/v6/shared/poll_start_test.go +++ b/command/v6/shared/poll_start_test.go @@ -13,8 +13,7 @@ import ( "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/shared/shared_suite_test.go b/command/v6/shared/shared_suite_test.go index 546758dc5c6..e3d82599836 100644 --- a/command/v6/shared/shared_suite_test.go +++ b/command/v6/shared/shared_suite_test.go @@ -1,10 +1,10 @@ package shared_test import ( - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) func TestShared(t *testing.T) { diff --git a/command/v6/shared/v3_poll_stage_test.go b/command/v6/shared/v3_poll_stage_test.go index 07e1ef753d0..e3b1bd0a50b 100644 --- a/command/v6/shared/v3_poll_stage_test.go +++ b/command/v6/shared/v3_poll_stage_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/command/v6/shared" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/unbind_service_command_test.go b/command/v6/unbind_service_command_test.go index c57fd34aa30..eb28450e342 100644 --- a/command/v6/unbind_service_command_test.go +++ b/command/v6/unbind_service_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/unshare_service_command_test.go b/command/v6/unshare_service_command_test.go index 450b0b145c9..50607d6341a 100644 --- a/command/v6/unshare_service_command_test.go +++ b/command/v6/unshare_service_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/update_service_command_test.go b/command/v6/update_service_command_test.go index 04ace71ef33..b8e2838ab0e 100644 --- a/command/v6/update_service_command_test.go +++ b/command/v6/update_service_command_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/update_user_provided_service_command_test.go b/command/v6/update_user_provided_service_command_test.go index a79a00109cb..9f95bcf15b9 100644 --- a/command/v6/update_user_provided_service_command_test.go +++ b/command/v6/update_user_provided_service_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gstruct" diff --git a/command/v6/v3_cancel_zdt_push_command_test.go b/command/v6/v3_cancel_zdt_push_command_test.go index afc0019a1cd..3abbac37a21 100644 --- a/command/v6/v3_cancel_zdt_push_command_test.go +++ b/command/v6/v3_cancel_zdt_push_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/v3_zdt_restart_command_test.go b/command/v6/v3_zdt_restart_command_test.go index ce104cb2fc6..c0c7ec74555 100644 --- a/command/v6/v3_zdt_restart_command_test.go +++ b/command/v6/v3_zdt_restart_command_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/command/v6/v6fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v6/v6_suite_test.go b/command/v6/v6_suite_test.go index 4b782e06572..7bbb91e832c 100644 --- a/command/v6/v6_suite_test.go +++ b/command/v6/v6_suite_test.go @@ -1,7 +1,7 @@ package v6_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/command/v7/add_network_policy_command_test.go b/command/v7/add_network_policy_command_test.go index f76d26c9317..a3b20675cee 100644 --- a/command/v7/add_network_policy_command_test.go +++ b/command/v7/add_network_policy_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/allow_space_ssh_command_test.go b/command/v7/allow_space_ssh_command_test.go index de3d1553c6b..2606239f217 100644 --- a/command/v7/allow_space_ssh_command_test.go +++ b/command/v7/allow_space_ssh_command_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/api_command_test.go b/command/v7/api_command_test.go index 66fad029a24..e9df7ae7e0c 100644 --- a/command/v7/api_command_test.go +++ b/command/v7/api_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/app_command_test.go b/command/v7/app_command_test.go index 784fd423367..283af132b87 100644 --- a/command/v7/app_command_test.go +++ b/command/v7/app_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/apply_manifest_command_test.go b/command/v7/apply_manifest_command_test.go index 122c6a9be19..d3a8167f78f 100644 --- a/command/v7/apply_manifest_command_test.go +++ b/command/v7/apply_manifest_command_test.go @@ -17,7 +17,7 @@ import ( "code.cloudfoundry.org/cli/util/manifestparser" "code.cloudfoundry.org/cli/util/ui" "github.com/cloudfoundry/bosh-cli/director/template" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/apps_command_test.go b/command/v7/apps_command_test.go index a9307cd8c34..53af5863bbe 100644 --- a/command/v7/apps_command_test.go +++ b/command/v7/apps_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/auth_command_test.go b/command/v7/auth_command_test.go index 9da4d3c2860..91c758ea128 100644 --- a/command/v7/auth_command_test.go +++ b/command/v7/auth_command_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/bind_running_security_group_command_test.go b/command/v7/bind_running_security_group_command_test.go index 72c36538671..10d58d6777b 100644 --- a/command/v7/bind_running_security_group_command_test.go +++ b/command/v7/bind_running_security_group_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/bind_security_group_command_test.go b/command/v7/bind_security_group_command_test.go index 54d5942cde4..8f44b33de7e 100644 --- a/command/v7/bind_security_group_command_test.go +++ b/command/v7/bind_security_group_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/bind_staging_security_group_command_test.go b/command/v7/bind_staging_security_group_command_test.go index f68996dadf3..00f0d5e5c4e 100644 --- a/command/v7/bind_staging_security_group_command_test.go +++ b/command/v7/bind_staging_security_group_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/buildpacks_command_test.go b/command/v7/buildpacks_command_test.go index 249ff890167..7c002a08e32 100644 --- a/command/v7/buildpacks_command_test.go +++ b/command/v7/buildpacks_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/cancel_deployment_command_test.go b/command/v7/cancel_deployment_command_test.go index 0653058f6e1..cae5dbdebed 100644 --- a/command/v7/cancel_deployment_command_test.go +++ b/command/v7/cancel_deployment_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/check_route_command_test.go b/command/v7/check_route_command_test.go index d529be0b960..8bc34856e1a 100644 --- a/command/v7/check_route_command_test.go +++ b/command/v7/check_route_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/config_command_test.go b/command/v7/config_command_test.go index a3762f101d1..dcc61aa6e88 100644 --- a/command/v7/config_command_test.go +++ b/command/v7/config_command_test.go @@ -8,7 +8,7 @@ import ( v7 "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/copy_source_command_test.go b/command/v7/copy_source_command_test.go index 7d4af8fa7c3..9f7b278b2be 100644 --- a/command/v7/copy_source_command_test.go +++ b/command/v7/copy_source_command_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_app_command_test.go b/command/v7/create_app_command_test.go index c53faa93895..1d6653bff05 100644 --- a/command/v7/create_app_command_test.go +++ b/command/v7/create_app_command_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_app_manifest_command_test.go b/command/v7/create_app_manifest_command_test.go index b3604ad5263..8b9a29b00db 100644 --- a/command/v7/create_app_manifest_command_test.go +++ b/command/v7/create_app_manifest_command_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_buildpack_command_test.go b/command/v7/create_buildpack_command_test.go index 374772da8a5..844b10aed9f 100644 --- a/command/v7/create_buildpack_command_test.go +++ b/command/v7/create_buildpack_command_test.go @@ -17,7 +17,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_isolation_segment_command_test.go b/command/v7/create_isolation_segment_command_test.go index 66112a628f6..db5de854d84 100644 --- a/command/v7/create_isolation_segment_command_test.go +++ b/command/v7/create_isolation_segment_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_org_command_test.go b/command/v7/create_org_command_test.go index 3c19d346c79..d6a7bf2cb06 100644 --- a/command/v7/create_org_command_test.go +++ b/command/v7/create_org_command_test.go @@ -15,7 +15,7 @@ import ( v7 "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_org_quota_command_test.go b/command/v7/create_org_quota_command_test.go index e1fe74f5d1d..4b36309d765 100644 --- a/command/v7/create_org_quota_command_test.go +++ b/command/v7/create_org_quota_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_package_command_test.go b/command/v7/create_package_command_test.go index f89c2a2b621..d73f9a54571 100644 --- a/command/v7/create_package_command_test.go +++ b/command/v7/create_package_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_private_domain_command_test.go b/command/v7/create_private_domain_command_test.go index 8363c569f90..a42c5bb933e 100644 --- a/command/v7/create_private_domain_command_test.go +++ b/command/v7/create_private_domain_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_route_command_test.go b/command/v7/create_route_command_test.go index ab9235bb432..bd37db2ec87 100644 --- a/command/v7/create_route_command_test.go +++ b/command/v7/create_route_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_security_group_command_test.go b/command/v7/create_security_group_command_test.go index 6f0c22d9da0..8e1ade6e8cd 100644 --- a/command/v7/create_security_group_command_test.go +++ b/command/v7/create_security_group_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_service_broker_command_test.go b/command/v7/create_service_broker_command_test.go index 6cc91f4ea52..f20fc495713 100644 --- a/command/v7/create_service_broker_command_test.go +++ b/command/v7/create_service_broker_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_shared_domain_command_test.go b/command/v7/create_shared_domain_command_test.go index b042d80cf11..53c7a100c5f 100644 --- a/command/v7/create_shared_domain_command_test.go +++ b/command/v7/create_shared_domain_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_space_command_test.go b/command/v7/create_space_command_test.go index 1ce148cf5c4..6f1d804917b 100644 --- a/command/v7/create_space_command_test.go +++ b/command/v7/create_space_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_space_quota_command_test.go b/command/v7/create_space_quota_command_test.go index 6e0894673da..04bf16ae3e2 100644 --- a/command/v7/create_space_quota_command_test.go +++ b/command/v7/create_space_quota_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/create_user_command_test.go b/command/v7/create_user_command_test.go index f60b5e7ff39..6f42a724227 100644 --- a/command/v7/create_user_command_test.go +++ b/command/v7/create_user_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_buildpack_command_test.go b/command/v7/delete_buildpack_command_test.go index 674b410fd20..ccd53b95b5d 100644 --- a/command/v7/delete_buildpack_command_test.go +++ b/command/v7/delete_buildpack_command_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_command_test.go b/command/v7/delete_command_test.go index cb6c483a67c..58ec7fcb020 100644 --- a/command/v7/delete_command_test.go +++ b/command/v7/delete_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_isolation_segment_command_test.go b/command/v7/delete_isolation_segment_command_test.go index 82382680858..1ccc939c9c1 100644 --- a/command/v7/delete_isolation_segment_command_test.go +++ b/command/v7/delete_isolation_segment_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_org_command_test.go b/command/v7/delete_org_command_test.go index 38bf89cc523..4e4c4d5afb3 100644 --- a/command/v7/delete_org_command_test.go +++ b/command/v7/delete_org_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_org_quota_command_test.go b/command/v7/delete_org_quota_command_test.go index 466c39b8e0f..182ba17b311 100644 --- a/command/v7/delete_org_quota_command_test.go +++ b/command/v7/delete_org_quota_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_orphaned_routes_command_test.go b/command/v7/delete_orphaned_routes_command_test.go index d0b8b09f2b4..dec3f2f3cfe 100644 --- a/command/v7/delete_orphaned_routes_command_test.go +++ b/command/v7/delete_orphaned_routes_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_private_domain_command_test.go b/command/v7/delete_private_domain_command_test.go index 0e43f958159..af7ac32e2e6 100644 --- a/command/v7/delete_private_domain_command_test.go +++ b/command/v7/delete_private_domain_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_route_command_test.go b/command/v7/delete_route_command_test.go index 653f28b324b..77b9bfc3055 100644 --- a/command/v7/delete_route_command_test.go +++ b/command/v7/delete_route_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_security_group_command_test.go b/command/v7/delete_security_group_command_test.go index 6bb006f2c71..ed29a6895b0 100644 --- a/command/v7/delete_security_group_command_test.go +++ b/command/v7/delete_security_group_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_service_broker_command_test.go b/command/v7/delete_service_broker_command_test.go index e42cf285aa5..87341a802b7 100644 --- a/command/v7/delete_service_broker_command_test.go +++ b/command/v7/delete_service_broker_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_shared_domain_command_test.go b/command/v7/delete_shared_domain_command_test.go index e9495ba004e..e7a74969f88 100644 --- a/command/v7/delete_shared_domain_command_test.go +++ b/command/v7/delete_shared_domain_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_space_command_test.go b/command/v7/delete_space_command_test.go index 45afc51fe83..a3abc019f88 100644 --- a/command/v7/delete_space_command_test.go +++ b/command/v7/delete_space_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_space_quota_command_test.go b/command/v7/delete_space_quota_command_test.go index b070f097ee9..66db6b1752c 100644 --- a/command/v7/delete_space_quota_command_test.go +++ b/command/v7/delete_space_quota_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/delete_user_command_test.go b/command/v7/delete_user_command_test.go index efb29b9e6fb..36d407865bf 100644 --- a/command/v7/delete_user_command_test.go +++ b/command/v7/delete_user_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/disable_feature_flag_command_test.go b/command/v7/disable_feature_flag_command_test.go index a22afa090c4..b1a3017df4a 100644 --- a/command/v7/disable_feature_flag_command_test.go +++ b/command/v7/disable_feature_flag_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/disable_org_isolation_command_test.go b/command/v7/disable_org_isolation_command_test.go index d5e2062e1f9..598fc3a9d50 100644 --- a/command/v7/disable_org_isolation_command_test.go +++ b/command/v7/disable_org_isolation_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/disable_service_access_command_test.go b/command/v7/disable_service_access_command_test.go index 49eb0d3366b..829173f4e12 100644 --- a/command/v7/disable_service_access_command_test.go +++ b/command/v7/disable_service_access_command_test.go @@ -9,8 +9,8 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/disable_ssh_command_test.go b/command/v7/disable_ssh_command_test.go index b90a06a7bfc..23c8ed73b99 100644 --- a/command/v7/disable_ssh_command_test.go +++ b/command/v7/disable_ssh_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/disallow_space_ssh_command_test.go b/command/v7/disallow_space_ssh_command_test.go index cbe6ca6bd39..80f9ec7588a 100644 --- a/command/v7/disallow_space_ssh_command_test.go +++ b/command/v7/disallow_space_ssh_command_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/docker_password_getter_test.go b/command/v7/docker_password_getter_test.go index 4c9bb9af121..f649b1a6e94 100644 --- a/command/v7/docker_password_getter_test.go +++ b/command/v7/docker_password_getter_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/command/commandfakes" . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/command/v7/domains_command_test.go b/command/v7/domains_command_test.go index db853bd41e8..d0fab281cc3 100644 --- a/command/v7/domains_command_test.go +++ b/command/v7/domains_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/download_droplet_command_test.go b/command/v7/download_droplet_command_test.go index ce1ea9b7a4d..a325884b236 100644 --- a/command/v7/download_droplet_command_test.go +++ b/command/v7/download_droplet_command_test.go @@ -15,8 +15,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/droplets_command_test.go b/command/v7/droplets_command_test.go index 554de013811..8b3eea5d655 100644 --- a/command/v7/droplets_command_test.go +++ b/command/v7/droplets_command_test.go @@ -16,7 +16,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/enable_feature_flag_command_test.go b/command/v7/enable_feature_flag_command_test.go index b9d9656fe7e..28a6ca2b3ef 100644 --- a/command/v7/enable_feature_flag_command_test.go +++ b/command/v7/enable_feature_flag_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/enable_org_isolation_command_test.go b/command/v7/enable_org_isolation_command_test.go index aa1b0579c29..f338550b136 100644 --- a/command/v7/enable_org_isolation_command_test.go +++ b/command/v7/enable_org_isolation_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/enable_service_access_command_test.go b/command/v7/enable_service_access_command_test.go index 408b321b8ab..3dd616944cd 100644 --- a/command/v7/enable_service_access_command_test.go +++ b/command/v7/enable_service_access_command_test.go @@ -10,8 +10,8 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/enable_ssh_command_test.go b/command/v7/enable_ssh_command_test.go index f32e30c0de7..b144f633f6a 100644 --- a/command/v7/enable_ssh_command_test.go +++ b/command/v7/enable_ssh_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/env_command_test.go b/command/v7/env_command_test.go index f03a6d2dc6c..fcf4088f90a 100644 --- a/command/v7/env_command_test.go +++ b/command/v7/env_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/events_command_test.go b/command/v7/events_command_test.go index 3873cba5b75..caa9958170b 100644 --- a/command/v7/events_command_test.go +++ b/command/v7/events_command_test.go @@ -16,7 +16,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/feature_flag_command_test.go b/command/v7/feature_flag_command_test.go index c70a51e5f9c..0560e7bdfea 100644 --- a/command/v7/feature_flag_command_test.go +++ b/command/v7/feature_flag_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/feature_flags_command_test.go b/command/v7/feature_flags_command_test.go index 9f86f63c819..e5353bedd15 100644 --- a/command/v7/feature_flags_command_test.go +++ b/command/v7/feature_flags_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/get_health_check_command_test.go b/command/v7/get_health_check_command_test.go index 6e8a00ff003..a4d2795ad4d 100644 --- a/command/v7/get_health_check_command_test.go +++ b/command/v7/get_health_check_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/isolation_segments_command_test.go b/command/v7/isolation_segments_command_test.go index bb6530e0359..c39bd880a52 100644 --- a/command/v7/isolation_segments_command_test.go +++ b/command/v7/isolation_segments_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/label_updater_test.go b/command/v7/label_updater_test.go index 4dec58bfb79..d1247b6e843 100644 --- a/command/v7/label_updater_test.go +++ b/command/v7/label_updater_test.go @@ -13,8 +13,8 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) @@ -141,7 +141,7 @@ var _ = Describe("LabelUpdater", func() { } Expect(err).To(MatchError(argumentCombinationError)) }, - labelSubcommands("buildpack")..., + labelSubcommands("buildpack"), ) DescribeTable( @@ -159,7 +159,7 @@ var _ = Describe("LabelUpdater", func() { } Expect(err).To(MatchError(argumentCombinationError)) }, - labelSubcommands("service-offering", "service-plan")..., + labelSubcommands("service-offering", "service-plan"), ) DescribeTable( @@ -177,7 +177,7 @@ var _ = Describe("LabelUpdater", func() { } Expect(err).To(MatchError(argumentCombinationError)) }, - labelSubcommands("service-plan")..., + labelSubcommands("service-plan"), ) DescribeTable( @@ -191,7 +191,7 @@ var _ = Describe("LabelUpdater", func() { err := cmd.Execute(targetResource, nil) Expect(err).To(MatchError("Target not found")) }, - labelSubcommands()..., + labelSubcommands(), ) DescribeTable( @@ -218,7 +218,7 @@ var _ = Describe("LabelUpdater", func() { Expect(checkSpace).To(BeFalse()) } }, - labelSubcommands()..., + labelSubcommands(), ) }) diff --git a/command/v7/labels_command_test.go b/command/v7/labels_command_test.go index 8bcc8e8d02c..0d1f167c33d 100644 --- a/command/v7/labels_command_test.go +++ b/command/v7/labels_command_test.go @@ -14,8 +14,8 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) @@ -82,7 +82,7 @@ var _ = Describe("labels command", func() { } Expect(executeErr).To(MatchError(argumentCombinationError)) }, - labelSubcommands("buildpack")..., + labelSubcommands("buildpack"), ) DescribeTable( @@ -98,7 +98,7 @@ var _ = Describe("labels command", func() { } Expect(executeErr).To(MatchError(argumentCombinationError)) }, - labelSubcommands("service-offering", "service-plan")..., + labelSubcommands("service-offering", "service-plan"), ) DescribeTable( @@ -114,7 +114,7 @@ var _ = Describe("labels command", func() { } Expect(err).To(MatchError(argumentCombinationError)) }, - labelSubcommands("service-plan")..., + labelSubcommands("service-plan"), ) DescribeTable( @@ -125,7 +125,7 @@ var _ = Describe("labels command", func() { err := cmd.Execute(nil) Expect(err).To(MatchError("Target not found")) }, - labelSubcommands()..., + labelSubcommands(), ) DescribeTable( @@ -150,7 +150,7 @@ var _ = Describe("labels command", func() { Expect(checkSpace).To(BeFalse()) } }, - labelSubcommands()..., + labelSubcommands(), ) type MethodCallCountType func() int diff --git a/command/v7/login_command_test.go b/command/v7/login_command_test.go index 4abf0b17b6a..fa6df210fa1 100644 --- a/command/v7/login_command_test.go +++ b/command/v7/login_command_test.go @@ -18,7 +18,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/logout_command_test.go b/command/v7/logout_command_test.go index ba9561b1190..575106f8a76 100644 --- a/command/v7/logout_command_test.go +++ b/command/v7/logout_command_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/logs_command_test.go b/command/v7/logs_command_test.go index dca73bcdc1d..23585584e79 100644 --- a/command/v7/logs_command_test.go +++ b/command/v7/logs_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/map_route_command_test.go b/command/v7/map_route_command_test.go index e3113172a38..1b1b2a44c5e 100644 --- a/command/v7/map_route_command_test.go +++ b/command/v7/map_route_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/marketplace_command_test.go b/command/v7/marketplace_command_test.go index 5d9ae8c8f0d..22e36156ff5 100644 --- a/command/v7/marketplace_command_test.go +++ b/command/v7/marketplace_command_test.go @@ -9,8 +9,8 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" "github.com/pkg/errors" diff --git a/command/v7/network_policies_command_test.go b/command/v7/network_policies_command_test.go index 1b7886113b7..a3fa1914f37 100644 --- a/command/v7/network_policies_command_test.go +++ b/command/v7/network_policies_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/oauth_token_command_test.go b/command/v7/oauth_token_command_test.go index e9f94cdcc1a..51eac274dcd 100644 --- a/command/v7/oauth_token_command_test.go +++ b/command/v7/oauth_token_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/util/ui" "github.com/SermoDigital/jose/crypto" "github.com/SermoDigital/jose/jws" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/org_command_test.go b/command/v7/org_command_test.go index a66260b5ca2..79e274f9ba4 100644 --- a/command/v7/org_command_test.go +++ b/command/v7/org_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/org_quota_command_test.go b/command/v7/org_quota_command_test.go index dcff1b5813c..20ca2a2711b 100644 --- a/command/v7/org_quota_command_test.go +++ b/command/v7/org_quota_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/org_quotas_command_test.go b/command/v7/org_quotas_command_test.go index 0096fe1927c..4eeb411f9c6 100644 --- a/command/v7/org_quotas_command_test.go +++ b/command/v7/org_quotas_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/org_users_command_test.go b/command/v7/org_users_command_test.go index 848529da91b..5f298e5e274 100644 --- a/command/v7/org_users_command_test.go +++ b/command/v7/org_users_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/orgs_command_test.go b/command/v7/orgs_command_test.go index c2da3108c85..c17cc7d102a 100644 --- a/command/v7/orgs_command_test.go +++ b/command/v7/orgs_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/packages_command_test.go b/command/v7/packages_command_test.go index f1d77c97147..5840b8fbd7d 100644 --- a/command/v7/packages_command_test.go +++ b/command/v7/packages_command_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/passwd_command_test.go b/command/v7/passwd_command_test.go index 64066a02f28..6b177d7c7f1 100644 --- a/command/v7/passwd_command_test.go +++ b/command/v7/passwd_command_test.go @@ -9,7 +9,7 @@ import ( v7 "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/purge_service_offering_command_test.go b/command/v7/purge_service_offering_command_test.go index 3d48ea0d109..c52d0335cd4 100644 --- a/command/v7/purge_service_offering_command_test.go +++ b/command/v7/purge_service_offering_command_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/push_command_test.go b/command/v7/push_command_test.go index 15f347342cd..61cf20163cc 100644 --- a/command/v7/push_command_test.go +++ b/command/v7/push_command_test.go @@ -22,8 +22,8 @@ import ( "code.cloudfoundry.org/cli/util/manifestparser" "code.cloudfoundry.org/cli/util/ui" "github.com/cloudfoundry/bosh-cli/director/template" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" "gopkg.in/yaml.v2" diff --git a/command/v7/remove_network_policy_command_test.go b/command/v7/remove_network_policy_command_test.go index 796a00fdff9..d81f689c732 100644 --- a/command/v7/remove_network_policy_command_test.go +++ b/command/v7/remove_network_policy_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/rename_command_test.go b/command/v7/rename_command_test.go index c5af690ee88..0497d7906e1 100644 --- a/command/v7/rename_command_test.go +++ b/command/v7/rename_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/rename_org_command_test.go b/command/v7/rename_org_command_test.go index 45ad25e0cc8..3689ee412a9 100644 --- a/command/v7/rename_org_command_test.go +++ b/command/v7/rename_org_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/rename_service_broker_command_test.go b/command/v7/rename_service_broker_command_test.go index 3eb552a8ff9..e495123954a 100644 --- a/command/v7/rename_service_broker_command_test.go +++ b/command/v7/rename_service_broker_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/rename_space_command_test.go b/command/v7/rename_space_command_test.go index d425f0146d1..3962376e99f 100644 --- a/command/v7/rename_space_command_test.go +++ b/command/v7/rename_space_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/reset_org_default_isolation_segment_command_test.go b/command/v7/reset_org_default_isolation_segment_command_test.go index 96b11c9c7e0..339d531255f 100644 --- a/command/v7/reset_org_default_isolation_segment_command_test.go +++ b/command/v7/reset_org_default_isolation_segment_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/reset_space_isolation_segment_command_test.go b/command/v7/reset_space_isolation_segment_command_test.go index 732863260ba..6d17805f141 100644 --- a/command/v7/reset_space_isolation_segment_command_test.go +++ b/command/v7/reset_space_isolation_segment_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/restage_command_test.go b/command/v7/restage_command_test.go index 714dc4be175..4df3a054af7 100644 --- a/command/v7/restage_command_test.go +++ b/command/v7/restage_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/restart_app_instance_command_test.go b/command/v7/restart_app_instance_command_test.go index feb88a99787..c2e3935e09a 100644 --- a/command/v7/restart_app_instance_command_test.go +++ b/command/v7/restart_app_instance_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/restart_command_test.go b/command/v7/restart_command_test.go index 41eb6d74dcf..649c0b2f863 100644 --- a/command/v7/restart_command_test.go +++ b/command/v7/restart_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/revision_command_test.go b/command/v7/revision_command_test.go index dbf0391774c..ef20e4b8bdf 100644 --- a/command/v7/revision_command_test.go +++ b/command/v7/revision_command_test.go @@ -5,7 +5,7 @@ import ( v7 "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/revisions_command_test.go b/command/v7/revisions_command_test.go index 63c07c0cd07..c04a44d532e 100644 --- a/command/v7/revisions_command_test.go +++ b/command/v7/revisions_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/rollback_command_test.go b/command/v7/rollback_command_test.go index 70255407600..56217137c77 100644 --- a/command/v7/rollback_command_test.go +++ b/command/v7/rollback_command_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/router_groups_command_test.go b/command/v7/router_groups_command_test.go index 78ce446f71c..08c3e39bce2 100644 --- a/command/v7/router_groups_command_test.go +++ b/command/v7/router_groups_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/routes_command_test.go b/command/v7/routes_command_test.go index 85cbd07fad7..04c8639811f 100644 --- a/command/v7/routes_command_test.go +++ b/command/v7/routes_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/run_task_command_test.go b/command/v7/run_task_command_test.go index 70190d232f1..72d9a374da0 100644 --- a/command/v7/run_task_command_test.go +++ b/command/v7/run_task_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/running_environment_variable_group_command_test.go b/command/v7/running_environment_variable_group_command_test.go index 8c652e57eda..0314df19750 100644 --- a/command/v7/running_environment_variable_group_command_test.go +++ b/command/v7/running_environment_variable_group_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/running_security_groups_command_test.go b/command/v7/running_security_groups_command_test.go index fcff0981938..d35746f5ba3 100644 --- a/command/v7/running_security_groups_command_test.go +++ b/command/v7/running_security_groups_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/scale_command_test.go b/command/v7/scale_command_test.go index 89abd07a942..9689ce642ce 100644 --- a/command/v7/scale_command_test.go +++ b/command/v7/scale_command_test.go @@ -16,7 +16,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/security_group_command_test.go b/command/v7/security_group_command_test.go index a92b1842e43..8ed30098b11 100644 --- a/command/v7/security_group_command_test.go +++ b/command/v7/security_group_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/security_groups_command_test.go b/command/v7/security_groups_command_test.go index 3674346b098..f7b894f47d5 100644 --- a/command/v7/security_groups_command_test.go +++ b/command/v7/security_groups_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/service_access_command_test.go b/command/v7/service_access_command_test.go index 574370392bd..e42616db144 100644 --- a/command/v7/service_access_command_test.go +++ b/command/v7/service_access_command_test.go @@ -10,8 +10,8 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/service_brokers_command_test.go b/command/v7/service_brokers_command_test.go index 2bf39910903..1ba294149b0 100644 --- a/command/v7/service_brokers_command_test.go +++ b/command/v7/service_brokers_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_droplet_command_test.go b/command/v7/set_droplet_command_test.go index a2b353b704c..d9311df1049 100644 --- a/command/v7/set_droplet_command_test.go +++ b/command/v7/set_droplet_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_env_command_test.go b/command/v7/set_env_command_test.go index b3fec239d18..b3984847d4c 100644 --- a/command/v7/set_env_command_test.go +++ b/command/v7/set_env_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_health_check_command_test.go b/command/v7/set_health_check_command_test.go index 83b872d9bd1..8fa4dd85d07 100644 --- a/command/v7/set_health_check_command_test.go +++ b/command/v7/set_health_check_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_label_command_test.go b/command/v7/set_label_command_test.go index 5cc16ca2eaa..7f730ce581b 100644 --- a/command/v7/set_label_command_test.go +++ b/command/v7/set_label_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/set_org_default_isolation_segment_command_test.go b/command/v7/set_org_default_isolation_segment_command_test.go index 4ba665bc06e..9246e0df74c 100644 --- a/command/v7/set_org_default_isolation_segment_command_test.go +++ b/command/v7/set_org_default_isolation_segment_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/command/commandfakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_org_quota_command_test.go b/command/v7/set_org_quota_command_test.go index 053ce3da626..7daef819009 100644 --- a/command/v7/set_org_quota_command_test.go +++ b/command/v7/set_org_quota_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/util/ui" . "code.cloudfoundry.org/cli/command/v7" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_org_role_command_test.go b/command/v7/set_org_role_command_test.go index 8fecc41923c..02fa8e97853 100644 --- a/command/v7/set_org_role_command_test.go +++ b/command/v7/set_org_role_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/command/commandfakes" . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_running_environment_variable_group_command_test.go b/command/v7/set_running_environment_variable_group_command_test.go index 81f649dafbd..9bbe8421dc7 100644 --- a/command/v7/set_running_environment_variable_group_command_test.go +++ b/command/v7/set_running_environment_variable_group_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_space_isolation_segment_command_test.go b/command/v7/set_space_isolation_segment_command_test.go index e34e72b9444..18e2282a704 100644 --- a/command/v7/set_space_isolation_segment_command_test.go +++ b/command/v7/set_space_isolation_segment_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_space_quota_command_test.go b/command/v7/set_space_quota_command_test.go index dd9c40c0ef2..4d2fa053149 100644 --- a/command/v7/set_space_quota_command_test.go +++ b/command/v7/set_space_quota_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/ui" . "code.cloudfoundry.org/cli/command/v7" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_space_role_command_test.go b/command/v7/set_space_role_command_test.go index d79196e908e..13c5d522c07 100644 --- a/command/v7/set_space_role_command_test.go +++ b/command/v7/set_space_role_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/command/commandfakes" . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/set_staging_environment_variable_group_command_test.go b/command/v7/set_staging_environment_variable_group_command_test.go index 28c4ba853b5..725a4c6b659 100644 --- a/command/v7/set_staging_environment_variable_group_command_test.go +++ b/command/v7/set_staging_environment_variable_group_command_test.go @@ -14,7 +14,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/share_private_domain_command_test.go b/command/v7/share_private_domain_command_test.go index c1bb263b130..c3c17ab328c 100644 --- a/command/v7/share_private_domain_command_test.go +++ b/command/v7/share_private_domain_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/shared/app_stager_test.go b/command/v7/shared/app_stager_test.go index b2c094cb3fa..ad62b2acd34 100644 --- a/command/v7/shared/app_stager_test.go +++ b/command/v7/shared/app_stager_test.go @@ -16,7 +16,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/shared/app_summary_displayer_test.go b/command/v7/shared/app_summary_displayer_test.go index d35d31af5cf..0b479e4c815 100644 --- a/command/v7/shared/app_summary_displayer_test.go +++ b/command/v7/shared/app_summary_displayer_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/shared/new_clients_test.go b/command/v7/shared/new_clients_test.go index 3db66563107..035c66a1032 100644 --- a/command/v7/shared/new_clients_test.go +++ b/command/v7/shared/new_clients_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7/shared" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/ghttp" diff --git a/command/v7/shared/new_networking_client_test.go b/command/v7/shared/new_networking_client_test.go index 1b9e4b57856..b9e0c344c18 100644 --- a/command/v7/shared/new_networking_client_test.go +++ b/command/v7/shared/new_networking_client_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/uaa" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/shared/shared_suite_test.go b/command/v7/shared/shared_suite_test.go index 599b4ca7e1a..83b5cbf8e80 100644 --- a/command/v7/shared/shared_suite_test.go +++ b/command/v7/shared/shared_suite_test.go @@ -1,7 +1,7 @@ package shared_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/command/v7/shared/v3_poll_stage_test.go b/command/v7/shared/v3_poll_stage_test.go index a33b59d936a..01483fbcef2 100644 --- a/command/v7/shared/v3_poll_stage_test.go +++ b/command/v7/shared/v3_poll_stage_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7/shared" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/shared/version_checker_test.go b/command/v7/shared/version_checker_test.go index 7003121feb5..702972e2589 100644 --- a/command/v7/shared/version_checker_test.go +++ b/command/v7/shared/version_checker_test.go @@ -2,7 +2,7 @@ package shared_test import ( "code.cloudfoundry.org/cli/command/v7/shared" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/space_command_test.go b/command/v7/space_command_test.go index 613e9888dfd..d350ab2883d 100644 --- a/command/v7/space_command_test.go +++ b/command/v7/space_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/space_quota_command_test.go b/command/v7/space_quota_command_test.go index 5bb7233b4a6..50ded6bac30 100644 --- a/command/v7/space_quota_command_test.go +++ b/command/v7/space_quota_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/types" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/space_quotas_command_test.go b/command/v7/space_quotas_command_test.go index 8782f364d7e..9b388d75082 100644 --- a/command/v7/space_quotas_command_test.go +++ b/command/v7/space_quotas_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/space_ssh_allowed_command_test.go b/command/v7/space_ssh_allowed_command_test.go index 262f9b48a45..ba208d631f9 100644 --- a/command/v7/space_ssh_allowed_command_test.go +++ b/command/v7/space_ssh_allowed_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/space_users_command_test.go b/command/v7/space_users_command_test.go index 1d637378865..809d9ab32fd 100644 --- a/command/v7/space_users_command_test.go +++ b/command/v7/space_users_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/spaces_command_test.go b/command/v7/spaces_command_test.go index af8acecb4ec..e456754e796 100644 --- a/command/v7/spaces_command_test.go +++ b/command/v7/spaces_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/ssh_code_command_test.go b/command/v7/ssh_code_command_test.go index dcc55d44a23..46dcf5fe599 100644 --- a/command/v7/ssh_code_command_test.go +++ b/command/v7/ssh_code_command_test.go @@ -9,7 +9,7 @@ import ( v7 "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/ssh_command_test.go b/command/v7/ssh_command_test.go index 25721f6c37c..556e25662e6 100644 --- a/command/v7/ssh_command_test.go +++ b/command/v7/ssh_command_test.go @@ -13,8 +13,8 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/ssh_enabled_command_test.go b/command/v7/ssh_enabled_command_test.go index ce168503255..794d61b42bb 100644 --- a/command/v7/ssh_enabled_command_test.go +++ b/command/v7/ssh_enabled_command_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/stack_command_test.go b/command/v7/stack_command_test.go index df528bf1dc9..3cbc36d577f 100644 --- a/command/v7/stack_command_test.go +++ b/command/v7/stack_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/stacks_command_test.go b/command/v7/stacks_command_test.go index 75533edbdbc..502f0106730 100644 --- a/command/v7/stacks_command_test.go +++ b/command/v7/stacks_command_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/stage_package_command_test.go b/command/v7/stage_package_command_test.go index f546d325cf5..7fbed642af2 100644 --- a/command/v7/stage_package_command_test.go +++ b/command/v7/stage_package_command_test.go @@ -17,7 +17,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/staging_environment_variable_group_command_test.go b/command/v7/staging_environment_variable_group_command_test.go index 1aa710988c6..ee64c2dc12c 100644 --- a/command/v7/staging_environment_variable_group_command_test.go +++ b/command/v7/staging_environment_variable_group_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/staging_security_groups_command_test.go b/command/v7/staging_security_groups_command_test.go index 9efc4847b12..9fd964a076d 100644 --- a/command/v7/staging_security_groups_command_test.go +++ b/command/v7/staging_security_groups_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/start_command_test.go b/command/v7/start_command_test.go index 8e3f67cbf58..beb2e78604c 100644 --- a/command/v7/start_command_test.go +++ b/command/v7/start_command_test.go @@ -15,7 +15,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/stop_command_test.go b/command/v7/stop_command_test.go index 189287a233d..34ae288038e 100644 --- a/command/v7/stop_command_test.go +++ b/command/v7/stop_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/target_command_test.go b/command/v7/target_command_test.go index c00a8a7a20f..f727241dabc 100644 --- a/command/v7/target_command_test.go +++ b/command/v7/target_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/translatableerror" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/tasks_command_test.go b/command/v7/tasks_command_test.go index 632dd3e04c2..e051bac2730 100644 --- a/command/v7/tasks_command_test.go +++ b/command/v7/tasks_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/terminate_task_command_test.go b/command/v7/terminate_task_command_test.go index 626b5f9bb11..b890c42f546 100644 --- a/command/v7/terminate_task_command_test.go +++ b/command/v7/terminate_task_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unbind_running_group_command_test.go b/command/v7/unbind_running_group_command_test.go index 02ba31d88f7..f7bc104d7c7 100644 --- a/command/v7/unbind_running_group_command_test.go +++ b/command/v7/unbind_running_group_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unbind_security_group_test.go b/command/v7/unbind_security_group_test.go index a49a638a33b..586704ec87f 100644 --- a/command/v7/unbind_security_group_test.go +++ b/command/v7/unbind_security_group_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unbind_staging_security_group_command_test.go b/command/v7/unbind_staging_security_group_command_test.go index 71c94e3fd3e..bc9b37b2ea3 100644 --- a/command/v7/unbind_staging_security_group_command_test.go +++ b/command/v7/unbind_staging_security_group_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unmap_route_command_test.go b/command/v7/unmap_route_command_test.go index 935ff65b41d..ca068d06c40 100644 --- a/command/v7/unmap_route_command_test.go +++ b/command/v7/unmap_route_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unset_env_command_test.go b/command/v7/unset_env_command_test.go index d1981cb8ee0..f1eae3c9114 100644 --- a/command/v7/unset_env_command_test.go +++ b/command/v7/unset_env_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unset_label_command_test.go b/command/v7/unset_label_command_test.go index e5513e83af6..09e5f7ddae2 100644 --- a/command/v7/unset_label_command_test.go +++ b/command/v7/unset_label_command_test.go @@ -5,7 +5,7 @@ import ( v7 "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/command/v7/unset_org_role_command_test.go b/command/v7/unset_org_role_command_test.go index dbf7edd48df..228c8ae22ee 100644 --- a/command/v7/unset_org_role_command_test.go +++ b/command/v7/unset_org_role_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/commandfakes" . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unset_space_quota_command_test.go b/command/v7/unset_space_quota_command_test.go index 0aa1cf93dca..6260893ff41 100644 --- a/command/v7/unset_space_quota_command_test.go +++ b/command/v7/unset_space_quota_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/util/ui" . "code.cloudfoundry.org/cli/command/v7" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unset_space_role_command_test.go b/command/v7/unset_space_role_command_test.go index f1c976d814d..e2d532887ee 100644 --- a/command/v7/unset_space_role_command_test.go +++ b/command/v7/unset_space_role_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/commandfakes" . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/unshare_private_domain_command_test.go b/command/v7/unshare_private_domain_command_test.go index b83d95bdc88..5fb36287bc4 100644 --- a/command/v7/unshare_private_domain_command_test.go +++ b/command/v7/unshare_private_domain_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/update_buildpack_command_test.go b/command/v7/update_buildpack_command_test.go index da56d6524f8..9e749f80407 100644 --- a/command/v7/update_buildpack_command_test.go +++ b/command/v7/update_buildpack_command_test.go @@ -17,7 +17,7 @@ import ( . "code.cloudfoundry.org/cli/command/v7" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/update_org_quota_command_test.go b/command/v7/update_org_quota_command_test.go index cd903e1aa03..cdd2138f876 100644 --- a/command/v7/update_org_quota_command_test.go +++ b/command/v7/update_org_quota_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/update_security_group_command_test.go b/command/v7/update_security_group_command_test.go index c15652a450d..79214391237 100644 --- a/command/v7/update_security_group_command_test.go +++ b/command/v7/update_security_group_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/update_service_broker_command_test.go b/command/v7/update_service_broker_command_test.go index 8a95d70d17c..5e147469ec4 100644 --- a/command/v7/update_service_broker_command_test.go +++ b/command/v7/update_service_broker_command_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/update_space_quota_command_test.go b/command/v7/update_space_quota_command_test.go index 37f1d10cffe..ba8c14741f9 100644 --- a/command/v7/update_space_quota_command_test.go +++ b/command/v7/update_space_quota_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/command/v7/v7fakes" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/command/v7/v7_suite_test.go b/command/v7/v7_suite_test.go index 7d81a3fdf06..8e7c32952cf 100644 --- a/command/v7/v7_suite_test.go +++ b/command/v7/v7_suite_test.go @@ -6,7 +6,7 @@ import ( "strings" uuid "github.com/nu7hatch/gouuid" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/go.mod b/go.mod index f08e1abe272..1b64decb101 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,17 @@ module code.cloudfoundry.org/cli go 1.22 require ( - code.cloudfoundry.org/bytefmt v0.0.0-20170428003108-f4415fafc561 + code.cloudfoundry.org/bytefmt v0.0.0-20230612151507-41ef4d1f67a4 code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6 code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85 code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4 code.cloudfoundry.org/clock v1.1.0 - code.cloudfoundry.org/diego-ssh v0.0.0-20170109142818-18cdb3586e7f + code.cloudfoundry.org/diego-ssh v0.0.0-20230810200140-af9d79fe9c82 code.cloudfoundry.org/go-log-cache/v2 v2.0.7 code.cloudfoundry.org/go-loggregator/v9 v9.2.0 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f code.cloudfoundry.org/jsonry v1.1.4 - code.cloudfoundry.org/lager v2.0.0+incompatible + code.cloudfoundry.org/lager/v3 v3.0.2 code.cloudfoundry.org/tlsconfig v0.0.0-20230612153104-23c0622de227 code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 @@ -21,20 +21,20 @@ require ( github.com/cloudfoundry/bosh-cli v6.4.1+incompatible github.com/cloudfoundry/noaa/v2 v2.4.0 github.com/cloudfoundry/sonde-go v0.0.0-20230710164515-a0a43d1dbbf8 + github.com/creack/pty v1.1.18 github.com/cyphar/filepath-securejoin v0.2.4 github.com/docker/distribution v2.8.3+incompatible github.com/fatih/color v1.16.0 github.com/google/go-querystring v1.1.0 github.com/jessevdk/go-flags v1.5.0 - github.com/kr/pty v1.1.8 github.com/lunixbochs/vtclean v1.0.0 github.com/mattn/go-colorable v0.1.13 github.com/mattn/go-runewidth v0.0.15 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/moby/term v0.5.0 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d - github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.32.0 + github.com/onsi/ginkgo/v2 v2.15.0 + github.com/onsi/gomega v1.31.1 github.com/pkg/errors v0.9.1 github.com/sabhiram/go-gitignore v0.0.0-20171017070213-362f9845770f github.com/sajari/fuzzy v1.0.0 @@ -49,24 +49,28 @@ require ( ) require ( + code.cloudfoundry.org/inigo v0.0.0-20230612153013-b300679e6ed6 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/bmatcuk/doublestar v1.3.4 // indirect github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect github.com/charlievieth/fs v0.0.3 // indirect github.com/cloudfoundry/bosh-utils v0.0.390 // indirect github.com/cppforlife/go-patch v0.1.0 // indirect - github.com/creack/pty v1.1.18 // indirect github.com/distribution/reference v0.5.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.6.0 // indirect + github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8 // indirect github.com/gorilla/websocket v1.5.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect - github.com/kr/text v0.2.0 // indirect + github.com/kr/pty v1.1.8 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/nxadm/tail v1.4.8 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/openzipkin/zipkin-go v0.4.1 // indirect github.com/rivo/uniseg v0.2.0 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/sys v0.18.0 // indirect diff --git a/go.sum b/go.sum index 8c7bc6d0137..bd8a2043377 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -code.cloudfoundry.org/bytefmt v0.0.0-20170428003108-f4415fafc561 h1:OKYHUwj6pyB9KWBoyy1yPJVWvoYV2N+9QqbvbSw8LjM= -code.cloudfoundry.org/bytefmt v0.0.0-20170428003108-f4415fafc561/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc= +code.cloudfoundry.org/bytefmt v0.0.0-20230612151507-41ef4d1f67a4 h1:9G5F8zgma5v0GdDvNz6iZwwJp3RS/z0SY/aHGfVwvTo= +code.cloudfoundry.org/bytefmt v0.0.0-20230612151507-41ef4d1f67a4/go.mod h1:wYHCXH/gI19ujoFVuMkY48qPpPCoHLKBKXPkn67h/Yc= code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6 h1:Yc9r1p21kEpni9WlG4mwOZw87TB2QlyS9sAEebZ3+ak= code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6/go.mod h1:u5FovqC5GGAEbFPz+IdjycDA+gIjhUwqxnu0vbHwVeM= code.cloudfoundry.org/cli-plugin-repo v0.0.0-20200304195157-af98c4be9b85 h1:jaHWw9opYjKPrDT19uydBBWSxl+g5F4Hv030fqMsalo= @@ -8,19 +8,21 @@ code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-8 code.cloudfoundry.org/cli/integration/assets/hydrabroker v0.0.0-20201002233634-81722a1144e4/go.mod h1:dVTgo9kQbYns/QM4A1C2GtxqUnFSvJTk2Qhw+M0/uzk= code.cloudfoundry.org/clock v1.1.0 h1:XLzC6W3Ah/Y7ht1rmZ6+QfPdt1iGWEAAtIZXgiaj57c= code.cloudfoundry.org/clock v1.1.0/go.mod h1:yA3fxddT9RINQL2XHS7PS+OXxKCGhfrZmlNUCIM6AKo= -code.cloudfoundry.org/diego-ssh v0.0.0-20170109142818-18cdb3586e7f h1:xDSTgaS6b/AkaBqvyEYfu6i1Z+y8JSCHAd/e1HGqyF4= -code.cloudfoundry.org/diego-ssh v0.0.0-20170109142818-18cdb3586e7f/go.mod h1:L2/glHnSK+wKnsG8oZZqdV2sgYY9NDo/I1aDJGhcWaM= +code.cloudfoundry.org/diego-ssh v0.0.0-20230810200140-af9d79fe9c82 h1:Bns1y0jSlcvfP0u8ael+TUlnyNHsNX808zuo58bf5so= +code.cloudfoundry.org/diego-ssh v0.0.0-20230810200140-af9d79fe9c82/go.mod h1:L2/glHnSK+wKnsG8oZZqdV2sgYY9NDo/I1aDJGhcWaM= code.cloudfoundry.org/go-log-cache/v2 v2.0.7 h1:yR/JjQ/RscO1n4xVAT9HDYcpx5ET/3Cq2/RhpJml6ZU= code.cloudfoundry.org/go-log-cache/v2 v2.0.7/go.mod h1:6KQe2FeeaqRheD5vCvpyTa80YoJojB/r21E54mT97Mc= code.cloudfoundry.org/go-loggregator/v9 v9.2.0 h1:YNVD654RhMWzG195DZm0gNnrWAJJhEw/gd/cc5Bv28s= code.cloudfoundry.org/go-loggregator/v9 v9.2.0/go.mod h1:AP7PmrWSpyC9ltOQHcwF16BVkAVXS96i8+8gwI4lXRY= code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTgeiff9vxdrfdqxibzpWjxLnuXDI5m6z3GJAk= code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI= +code.cloudfoundry.org/inigo v0.0.0-20230612153013-b300679e6ed6 h1:lhQNfVleRMX7dsZVZViC0gI9r/rwkO+esz06+HDCSu0= +code.cloudfoundry.org/inigo v0.0.0-20230612153013-b300679e6ed6/go.mod h1:1ZB1JCh2FAp+SqX79ve6dc8YREvbsziULEOncAilX4Q= code.cloudfoundry.org/jsonry v1.1.4 h1:P9N7IlH1/4aRCLcXLgLFj1hkcBmV7muijJzY+K6U4hE= code.cloudfoundry.org/jsonry v1.1.4/go.mod h1:6aKilShQP7w/Ez76h1El2/n9y2OkHuU56nKSBB9Gp0A= code.cloudfoundry.org/lager v1.1.1-0.20191008172124-a9afc05ee5be/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk= -code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ= -code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk= +code.cloudfoundry.org/lager/v3 v3.0.2 h1:H0dcQY+814G1Ea0e5K/AMaMpcr+Pe5Iv+AALJEwrP9U= +code.cloudfoundry.org/lager/v3 v3.0.2/go.mod h1:zA6tOIWhr5uZUez+PGpdfBHDWQOfhOrr0cgKDagZPwk= code.cloudfoundry.org/tlsconfig v0.0.0-20230612153104-23c0622de227 h1:QYyb6Ur0Ys6FciDB3+8zCW3eVk7AxAs2++Foa5DAdt0= code.cloudfoundry.org/tlsconfig v0.0.0-20230612153104-23c0622de227/go.mod h1:C8SxvGRSutmgzV2FxH8Zwqz2Q8HsaAITQRQFKhlDzPw= code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d h1:M+zXqtXJqcsmpL76aU0tdl1ho23eYa4axYoM4gD62UA= @@ -60,7 +62,6 @@ github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2 github.com/cppforlife/go-patch v0.1.0 h1:I0fT+gFTSW4xWwvaTaUUVjr9xxjNXJ4naGc01BeQjwY= github.com/cppforlife/go-patch v0.1.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= @@ -116,8 +117,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f h1:pDhu5sgp8yJlEF/g6osliIIpF9K4F5jvkULXa4daRDQ= -github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8 h1:gpptm606MZYGaMHMsB4Srmb6EbW/IVHnt04rcMXnkBQ= +github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -184,10 +185,12 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= -github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= -github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= +github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= +github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/openzipkin/zipkin-go v0.4.1 h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A= +github.com/openzipkin/zipkin-go v0.4.1/go.mod h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM= github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pivotal-cf/brokerapi/v7 v7.2.0/go.mod h1:5QRQ8vJmav91F+AvY5NA/QoDOq70XgBVxXKUK4N/cNE= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/integration/README.md b/integration/README.md index 021f6641e3b..6de6c90a319 100644 --- a/integration/README.md +++ b/integration/README.md @@ -27,7 +27,7 @@ Running `make integration-tests` can be time-consuming, because it includes the - `plugin` suite is for tests that surround the CF CLI plugin framework. *These tests do not run in parallel.* ## How to run -These tests rely on [ginkgo](https://github.com/onsi/ginkgo) to be installed. +These tests rely on [ginkgo](https://github.com/onsi/ginkgo/v2) to be installed. Run command for the `isolated`, `push` and `experimental` suite: ``` diff --git a/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go b/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go index 4d20e0df1ca..ee9ae0bf350 100644 --- a/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go +++ b/integration/assets/hydrabroker/integrationtest/integrationtest_suite_test.go @@ -3,7 +3,7 @@ package integrationtest_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go index d8cf56960bc..919b38a7d31 100644 --- a/integration/assets/hydrabroker/integrationtest/integrationtest_test.go +++ b/integration/assets/hydrabroker/integrationtest/integrationtest_test.go @@ -14,9 +14,8 @@ import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/app" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" uuid2 "github.com/nu7hatch/gouuid" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/onsi/gomega/gstruct" "github.com/pivotal-cf/brokerapi/v7/domain/apiresponses" ) diff --git a/integration/helpers/app.go b/integration/helpers/app.go index fc69d4fe2aa..3fd800639c7 100644 --- a/integration/helpers/app.go +++ b/integration/helpers/app.go @@ -347,7 +347,7 @@ func WaitForAppMemoryToTakeEffect(appName string, processIndex int, instanceInde Eventually(session).Should(Exit(0)) appTable := ParseV3AppProcessTable(session.Out.Contents()) return appTable.Processes[processIndex].Instances[instanceIndex].Memory - }).Should(MatchRegexp(fmt.Sprintf(`\d+(\.\d+)?[KMG]? of %s`, expectedMemory))) + }).Should(MatchRegexp(fmt.Sprintf(`\d+(\.\d+)?[BKMG]? of %s`, expectedMemory))) } func WaitForAppDiskToTakeEffect(appName string, processIndex int, instanceIndex int, shouldRestartFirst bool, expectedDisk string) { diff --git a/integration/helpers/app_instance_table_test.go b/integration/helpers/app_instance_table_test.go index 31fc921e530..da1a27d04b0 100644 --- a/integration/helpers/app_instance_table_test.go +++ b/integration/helpers/app_instance_table_test.go @@ -3,7 +3,7 @@ package helpers_test import ( . "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/app_test.go b/integration/helpers/app_test.go index 0954de85dd0..facc0321d60 100644 --- a/integration/helpers/app_test.go +++ b/integration/helpers/app_test.go @@ -2,7 +2,7 @@ package helpers_test import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/client_credentials.go b/integration/helpers/client_credentials.go index 8d8a155b00a..4b027e5cb15 100644 --- a/integration/helpers/client_credentials.go +++ b/integration/helpers/client_credentials.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/command.go b/integration/helpers/command.go index 377b014db61..d06df76097b 100644 --- a/integration/helpers/command.go +++ b/integration/helpers/command.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/commonisolated/common_isolated_setup.go b/integration/helpers/commonisolated/common_isolated_setup.go index 0960c1acf68..0f071c7d028 100644 --- a/integration/helpers/commonisolated/common_isolated_setup.go +++ b/integration/helpers/commonisolated/common_isolated_setup.go @@ -6,7 +6,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -47,7 +47,7 @@ func CommonGinkgoSetup( return nil }, func(_ []byte) { - _, _ = GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + _, _ = GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) // Ginkgo Globals SetDefaultEventuallyTimeout(CFEventuallyTimeout) SetDefaultConsistentlyDuration(CFConsistentlyTimeout) @@ -56,17 +56,17 @@ func CommonGinkgoSetup( helpers.TurnOffColors() *readOnlyOrg, *readOnlySpace = helpers.SetupReadOnlyOrgAndSpace() - _, _ = GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + _, _ = GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) }) var _ = SynchronizedAfterSuite(func() { - _, _ = GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelNode()))) + _, _ = GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelProcess()))) *homeDir = helpers.SetHomeDir() helpers.SetAPI() helpers.LoginCF() helpers.QuickDeleteOrg(*readOnlyOrg) helpers.DestroyHomeDir(*homeDir) - _, _ = GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelNode()))) + _, _ = GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelProcess()))) }, func() {}) var _ = BeforeEach(func() { diff --git a/integration/helpers/config.go b/integration/helpers/config.go index aff1855997f..b830dfa10f6 100644 --- a/integration/helpers/config.go +++ b/integration/helpers/config.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/docker.go b/integration/helpers/docker.go index a17b57a34af..961653205d2 100644 --- a/integration/helpers/docker.go +++ b/integration/helpers/docker.go @@ -3,7 +3,7 @@ package helpers import ( "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" ) // SkipIfPrivateDockerInfoNotSet skips the test if CF_INT_DOCKER_IMAGE, diff --git a/integration/helpers/environment.go b/integration/helpers/environment.go index 7fc74795a0c..9ce9bfeb055 100644 --- a/integration/helpers/environment.go +++ b/integration/helpers/environment.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/helpers/helpers_suite_test.go b/integration/helpers/helpers_suite_test.go index ebb490012ac..c668e16cffc 100644 --- a/integration/helpers/helpers_suite_test.go +++ b/integration/helpers/helpers_suite_test.go @@ -1,7 +1,7 @@ package helpers_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/integration/helpers/isolation_segment.go b/integration/helpers/isolation_segment.go index 6ec46996f90..6588abe689f 100644 --- a/integration/helpers/isolation_segment.go +++ b/integration/helpers/isolation_segment.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/login.go b/integration/helpers/login.go index 74445b19fbf..939698a4ce3 100644 --- a/integration/helpers/login.go +++ b/integration/helpers/login.go @@ -7,7 +7,7 @@ import ( "strings" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/os.go b/integration/helpers/os.go index f9b117e7c7d..d06014e592f 100644 --- a/integration/helpers/os.go +++ b/integration/helpers/os.go @@ -3,7 +3,7 @@ package helpers import ( "runtime" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" ) func IsWindows() bool { diff --git a/integration/helpers/service_binding.go b/integration/helpers/service_binding.go index 5ab99e11b38..6c2717831c7 100644 --- a/integration/helpers/service_binding.go +++ b/integration/helpers/service_binding.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2" "code.cloudfoundry.org/cli/api/cloudcontroller/ccv2/constant" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/helpers/servicebrokerstub/app_deploy.go b/integration/helpers/servicebrokerstub/app_deploy.go index 741598319ac..d5c21c389e8 100644 --- a/integration/helpers/servicebrokerstub/app_deploy.go +++ b/integration/helpers/servicebrokerstub/app_deploy.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/onsi/ginkgo" + "github.com/onsi/ginkgo/v2" "code.cloudfoundry.org/cli/integration/helpers" . "github.com/onsi/gomega" @@ -25,7 +25,7 @@ const ( func ensureAppIsDeployed() { if !appResponds() { ensureAppIsPushed() - Eventually(appResponds).Should(BeTrue()) + Eventually(appResponds()).Should(BeTrue()) } } diff --git a/integration/helpers/version.go b/integration/helpers/version.go index a7ab59d401a..50f70ce481b 100644 --- a/integration/helpers/version.go +++ b/integration/helpers/version.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/actor/versioncheck" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/helpers/version_v7.go b/integration/helpers/version_v7.go index a392e8aa9b7..800ede10f5f 100644 --- a/integration/helpers/version_v7.go +++ b/integration/helpers/version_v7.go @@ -3,7 +3,7 @@ package helpers import ( "fmt" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" ) const V7 = true diff --git a/integration/shared/experimental/experimental_suite_test.go b/integration/shared/experimental/experimental_suite_test.go index 028d93b2dd4..fb60b700c16 100644 --- a/integration/shared/experimental/experimental_suite_test.go +++ b/integration/shared/experimental/experimental_suite_test.go @@ -6,7 +6,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/shared/global/global_suite_test.go b/integration/shared/global/global_suite_test.go index 0b5c246a056..04e8be3c60b 100644 --- a/integration/shared/global/global_suite_test.go +++ b/integration/shared/global/global_suite_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/integration/shared/global/running_environment_variable_group_command_test.go b/integration/shared/global/running_environment_variable_group_command_test.go index 9ffd173e61c..7ccd5fa7d18 100644 --- a/integration/shared/global/running_environment_variable_group_command_test.go +++ b/integration/shared/global/running_environment_variable_group_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/shared/global/staging_environment_variable_group_command_test.go b/integration/shared/global/staging_environment_variable_group_command_test.go index fcf1f6c1780..612822bd839 100644 --- a/integration/shared/global/staging_environment_variable_group_command_test.go +++ b/integration/shared/global/staging_environment_variable_group_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/shared/isolated/apps_command_test.go b/integration/shared/isolated/apps_command_test.go index 984898d8942..68167ac179d 100644 --- a/integration/shared/isolated/apps_command_test.go +++ b/integration/shared/isolated/apps_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/auth_command_test.go b/integration/shared/isolated/auth_command_test.go index 1a8f02fb03e..11c237b6486 100644 --- a/integration/shared/isolated/auth_command_test.go +++ b/integration/shared/isolated/auth_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/api/uaa/uaaversion" "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/config_test.go b/integration/shared/isolated/config_test.go index 2870b9ac0ba..f8dc92da996 100644 --- a/integration/shared/isolated/config_test.go +++ b/integration/shared/isolated/config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" helpers "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/error_handling_test.go b/integration/shared/isolated/error_handling_test.go index 6e4563173f5..2926bc20ca3 100644 --- a/integration/shared/isolated/error_handling_test.go +++ b/integration/shared/isolated/error_handling_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/internationalization_test.go b/integration/shared/isolated/internationalization_test.go index 00c82d55fcc..7b5c8afd1aa 100644 --- a/integration/shared/isolated/internationalization_test.go +++ b/integration/shared/isolated/internationalization_test.go @@ -2,8 +2,7 @@ package isolated import ( helpers "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/logs_command_test.go b/integration/shared/isolated/logs_command_test.go index 51ce576c969..d250756a1d9 100644 --- a/integration/shared/isolated/logs_command_test.go +++ b/integration/shared/isolated/logs_command_test.go @@ -9,7 +9,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/restart_app_instance_command_test.go b/integration/shared/isolated/restart_app_instance_command_test.go index 20cfb37f036..0e801ea7886 100644 --- a/integration/shared/isolated/restart_app_instance_command_test.go +++ b/integration/shared/isolated/restart_app_instance_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/spaces_command_test.go b/integration/shared/isolated/spaces_command_test.go index 7fb2f4bea65..2fca098d47a 100644 --- a/integration/shared/isolated/spaces_command_test.go +++ b/integration/shared/isolated/spaces_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/isolated/version_command_test.go b/integration/shared/isolated/version_command_test.go index d8f01c495a2..35da3f34c1a 100644 --- a/integration/shared/isolated/version_command_test.go +++ b/integration/shared/isolated/version_command_test.go @@ -6,8 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "github.com/blang/semver/v4" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/performance/performance_suite_test.go b/integration/shared/performance/performance_suite_test.go index d36919b1360..a32dce35ab4 100644 --- a/integration/shared/performance/performance_suite_test.go +++ b/integration/shared/performance/performance_suite_test.go @@ -6,7 +6,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/shared/plugin/add_plugin_repo_test.go b/integration/shared/plugin/add_plugin_repo_test.go index befa5f31549..41f9ec43d96 100644 --- a/integration/shared/plugin/add_plugin_repo_test.go +++ b/integration/shared/plugin/add_plugin_repo_test.go @@ -8,7 +8,7 @@ import ( "net/http" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/api_test.go b/integration/shared/plugin/api_test.go index 99bce5d40ba..8b2b4a56dde 100644 --- a/integration/shared/plugin/api_test.go +++ b/integration/shared/plugin/api_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/help_test.go b/integration/shared/plugin/help_test.go index de5b59510f9..aa8b37bb8d7 100644 --- a/integration/shared/plugin/help_test.go +++ b/integration/shared/plugin/help_test.go @@ -2,8 +2,7 @@ package plugin import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/install_plugin_command_test.go b/integration/shared/plugin/install_plugin_command_test.go index 3917214e28c..52ad2b261e7 100644 --- a/integration/shared/plugin/install_plugin_command_test.go +++ b/integration/shared/plugin/install_plugin_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/install_plugin_command_unix_test.go b/integration/shared/plugin/install_plugin_command_unix_test.go index cca2ffeee18..4deae1aaed2 100644 --- a/integration/shared/plugin/install_plugin_command_unix_test.go +++ b/integration/shared/plugin/install_plugin_command_unix_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/shared/plugin/install_plugin_from_repo_command_test.go b/integration/shared/plugin/install_plugin_from_repo_command_test.go index 541aa04bd11..15d707292ac 100644 --- a/integration/shared/plugin/install_plugin_from_repo_command_test.go +++ b/integration/shared/plugin/install_plugin_from_repo_command_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/logs_test.go b/integration/shared/plugin/logs_test.go index 43491cfc416..fd7df06f8e3 100644 --- a/integration/shared/plugin/logs_test.go +++ b/integration/shared/plugin/logs_test.go @@ -2,7 +2,7 @@ package plugin import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/plugin_suite_test.go b/integration/shared/plugin/plugin_suite_test.go index ce67c21d879..4411dd6fe7d 100644 --- a/integration/shared/plugin/plugin_suite_test.go +++ b/integration/shared/plugin/plugin_suite_test.go @@ -5,7 +5,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/plugins_command_test.go b/integration/shared/plugin/plugins_command_test.go index 7c596a47897..f02ce4f7c8d 100644 --- a/integration/shared/plugin/plugins_command_test.go +++ b/integration/shared/plugin/plugins_command_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/runner_test.go b/integration/shared/plugin/runner_test.go index 31bdcc6c0f6..0f2bc869334 100644 --- a/integration/shared/plugin/runner_test.go +++ b/integration/shared/plugin/runner_test.go @@ -4,7 +4,7 @@ import ( "os" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/uninstall_plugin_command_test.go b/integration/shared/plugin/uninstall_plugin_command_test.go index 732b7e24aac..f937e9e842d 100644 --- a/integration/shared/plugin/uninstall_plugin_command_test.go +++ b/integration/shared/plugin/uninstall_plugin_command_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/shared/plugin/uninstall_plugin_command_unix_test.go b/integration/shared/plugin/uninstall_plugin_command_unix_test.go index 6d812450bf0..7458c325f6f 100644 --- a/integration/shared/plugin/uninstall_plugin_command_unix_test.go +++ b/integration/shared/plugin/uninstall_plugin_command_unix_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/experimental_suite_test.go b/integration/v6/experimental/experimental_suite_test.go index 873c036e213..d3fdc585d3b 100644 --- a/integration/v6/experimental/experimental_suite_test.go +++ b/integration/v6/experimental/experimental_suite_test.go @@ -6,7 +6,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v6/experimental/v3_apply_manifest_command_test.go b/integration/v6/experimental/v3_apply_manifest_command_test.go index 6d49a06f4fa..59ed93126db 100644 --- a/integration/v6/experimental/v3_apply_manifest_command_test.go +++ b/integration/v6/experimental/v3_apply_manifest_command_test.go @@ -7,7 +7,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_apps_command_test.go b/integration/v6/experimental/v3_apps_command_test.go index 2197462b140..ceacb57520c 100644 --- a/integration/v6/experimental/v3_apps_command_test.go +++ b/integration/v6/experimental/v3_apps_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_cancel_zdt_push_test.go b/integration/v6/experimental/v3_cancel_zdt_push_test.go index 3c7dfe6bf97..4c589f6808f 100644 --- a/integration/v6/experimental/v3_cancel_zdt_push_test.go +++ b/integration/v6/experimental/v3_cancel_zdt_push_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_create_app_command_test.go b/integration/v6/experimental/v3_create_app_command_test.go index 4842f1ea9be..02e3d19cee9 100644 --- a/integration/v6/experimental/v3_create_app_command_test.go +++ b/integration/v6/experimental/v3_create_app_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_create_package_cfignore_test.go b/integration/v6/experimental/v3_create_package_cfignore_test.go index fc26d49cc0d..02ea4ef4153 100644 --- a/integration/v6/experimental/v3_create_package_cfignore_test.go +++ b/integration/v6/experimental/v3_create_package_cfignore_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v6/experimental/v3_create_package_command_test.go b/integration/v6/experimental/v3_create_package_command_test.go index f6eed16c43d..e58c8f67300 100644 --- a/integration/v6/experimental/v3_create_package_command_test.go +++ b/integration/v6/experimental/v3_create_package_command_test.go @@ -6,7 +6,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_delete_command_test.go b/integration/v6/experimental/v3_delete_command_test.go index 349adba4915..31a1c61fe7b 100644 --- a/integration/v6/experimental/v3_delete_command_test.go +++ b/integration/v6/experimental/v3_delete_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_droplets_command_test.go b/integration/v6/experimental/v3_droplets_command_test.go index 8cd2da9eae5..8df79507ec0 100644 --- a/integration/v6/experimental/v3_droplets_command_test.go +++ b/integration/v6/experimental/v3_droplets_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_env_command_test.go b/integration/v6/experimental/v3_env_command_test.go index d0a69db2327..f06f3586773 100644 --- a/integration/v6/experimental/v3_env_command_test.go +++ b/integration/v6/experimental/v3_env_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_get_health_check_command_test.go b/integration/v6/experimental/v3_get_health_check_command_test.go index cd8a0bd6039..56e3b6db044 100644 --- a/integration/v6/experimental/v3_get_health_check_command_test.go +++ b/integration/v6/experimental/v3_get_health_check_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_packages_command_test.go b/integration/v6/experimental/v3_packages_command_test.go index efa17acb653..fc25187eef0 100644 --- a/integration/v6/experimental/v3_packages_command_test.go +++ b/integration/v6/experimental/v3_packages_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_push_cfignore_test.go b/integration/v6/experimental/v3_push_cfignore_test.go index 6a5b5bd76d1..68331c4d927 100644 --- a/integration/v6/experimental/v3_push_cfignore_test.go +++ b/integration/v6/experimental/v3_push_cfignore_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v6/experimental/v3_push_command_test.go b/integration/v6/experimental/v3_push_command_test.go index caf93d0347b..421cb8c6d9f 100644 --- a/integration/v6/experimental/v3_push_command_test.go +++ b/integration/v6/experimental/v3_push_command_test.go @@ -9,7 +9,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_push_no_start_test.go b/integration/v6/experimental/v3_push_no_start_test.go index b1dea9a4b29..5d70f179342 100644 --- a/integration/v6/experimental/v3_push_no_start_test.go +++ b/integration/v6/experimental/v3_push_no_start_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_restart_app_instance_command_test.go b/integration/v6/experimental/v3_restart_app_instance_command_test.go index a8bf067b853..776874970e9 100644 --- a/integration/v6/experimental/v3_restart_app_instance_command_test.go +++ b/integration/v6/experimental/v3_restart_app_instance_command_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_restart_command_test.go b/integration/v6/experimental/v3_restart_command_test.go index 4dca3308819..7a940b51ec7 100644 --- a/integration/v6/experimental/v3_restart_command_test.go +++ b/integration/v6/experimental/v3_restart_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_scale_command_test.go b/integration/v6/experimental/v3_scale_command_test.go index 2b8e7e196aa..88cb13e0eab 100644 --- a/integration/v6/experimental/v3_scale_command_test.go +++ b/integration/v6/experimental/v3_scale_command_test.go @@ -5,7 +5,7 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_set_droplet_command_test.go b/integration/v6/experimental/v3_set_droplet_command_test.go index b3e87c5518b..e27555ea12b 100644 --- a/integration/v6/experimental/v3_set_droplet_command_test.go +++ b/integration/v6/experimental/v3_set_droplet_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_set_env_command_test.go b/integration/v6/experimental/v3_set_env_command_test.go index f076a1b153a..215f79d9fe2 100644 --- a/integration/v6/experimental/v3_set_env_command_test.go +++ b/integration/v6/experimental/v3_set_env_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_set_health_check_command_test.go b/integration/v6/experimental/v3_set_health_check_command_test.go index 8e335bdf14d..e39657a8aa2 100644 --- a/integration/v6/experimental/v3_set_health_check_command_test.go +++ b/integration/v6/experimental/v3_set_health_check_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_ssh_command_test.go b/integration/v6/experimental/v3_ssh_command_test.go index c9c0b4b918b..d5bfd8d1e9f 100644 --- a/integration/v6/experimental/v3_ssh_command_test.go +++ b/integration/v6/experimental/v3_ssh_command_test.go @@ -6,7 +6,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_stage_command_test.go b/integration/v6/experimental/v3_stage_command_test.go index 2cb1a21f9a3..40b3270340a 100644 --- a/integration/v6/experimental/v3_stage_command_test.go +++ b/integration/v6/experimental/v3_stage_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_start_command_test.go b/integration/v6/experimental/v3_start_command_test.go index 8b037a1f769..671290ea43a 100644 --- a/integration/v6/experimental/v3_start_command_test.go +++ b/integration/v6/experimental/v3_start_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_stop_application_command_test.go b/integration/v6/experimental/v3_stop_application_command_test.go index 78ab84fe642..98309fdc273 100644 --- a/integration/v6/experimental/v3_stop_application_command_test.go +++ b/integration/v6/experimental/v3_stop_application_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_unset_env_command_test.go b/integration/v6/experimental/v3_unset_env_command_test.go index bbcb125cab3..85bb515a330 100644 --- a/integration/v6/experimental/v3_unset_env_command_test.go +++ b/integration/v6/experimental/v3_unset_env_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_zdt_push_command_test.go b/integration/v6/experimental/v3_zdt_push_command_test.go index ba07742e4d0..70cc5f82f2e 100644 --- a/integration/v6/experimental/v3_zdt_push_command_test.go +++ b/integration/v6/experimental/v3_zdt_push_command_test.go @@ -9,7 +9,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/experimental/v3_zdt_restart_command_test.go b/integration/v6/experimental/v3_zdt_restart_command_test.go index b66faad37d8..76030b4a4c0 100644 --- a/integration/v6/experimental/v3_zdt_restart_command_test.go +++ b/integration/v6/experimental/v3_zdt_restart_command_test.go @@ -2,7 +2,7 @@ package experimental import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/bind_staging_security_group_command_test.go b/integration/v6/global/bind_staging_security_group_command_test.go index 1ef295aa3f5..c025ebb103c 100644 --- a/integration/v6/global/bind_staging_security_group_command_test.go +++ b/integration/v6/global/bind_staging_security_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/buildpacks_command_test.go b/integration/v6/global/buildpacks_command_test.go index fdb820dafdd..0ab7e9e2881 100644 --- a/integration/v6/global/buildpacks_command_test.go +++ b/integration/v6/global/buildpacks_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/create_buildpack_command_test.go b/integration/v6/global/create_buildpack_command_test.go index 5832f579d99..739c4eb4600 100644 --- a/integration/v6/global/create_buildpack_command_test.go +++ b/integration/v6/global/create_buildpack_command_test.go @@ -9,7 +9,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/delete_buildpack_command_test.go b/integration/v6/global/delete_buildpack_command_test.go index 9764432dd4d..a246ef0e78f 100644 --- a/integration/v6/global/delete_buildpack_command_test.go +++ b/integration/v6/global/delete_buildpack_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/disable_feature_flags_command_test.go b/integration/v6/global/disable_feature_flags_command_test.go index 0c2a0b025cd..5b188d72289 100644 --- a/integration/v6/global/disable_feature_flags_command_test.go +++ b/integration/v6/global/disable_feature_flags_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/enable_feature_flags_command_test.go b/integration/v6/global/enable_feature_flags_command_test.go index 13b9324055c..1b4ed1003c4 100644 --- a/integration/v6/global/enable_feature_flags_command_test.go +++ b/integration/v6/global/enable_feature_flags_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/env_command_test.go b/integration/v6/global/env_command_test.go index 7840b67acaa..7280d32f053 100644 --- a/integration/v6/global/env_command_test.go +++ b/integration/v6/global/env_command_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/feature_flags_command_test.go b/integration/v6/global/feature_flags_command_test.go index b977f6709d3..d0416d40c5a 100644 --- a/integration/v6/global/feature_flags_command_test.go +++ b/integration/v6/global/feature_flags_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/global_suite_test.go b/integration/v6/global/global_suite_test.go index 0b5c246a056..04e8be3c60b 100644 --- a/integration/v6/global/global_suite_test.go +++ b/integration/v6/global/global_suite_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/integration/v6/global/quota_command_test.go b/integration/v6/global/quota_command_test.go index e73e76a78ab..d77413f1d29 100644 --- a/integration/v6/global/quota_command_test.go +++ b/integration/v6/global/quota_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/quotas_command_test.go b/integration/v6/global/quotas_command_test.go index 952a3277771..15010d86856 100644 --- a/integration/v6/global/quotas_command_test.go +++ b/integration/v6/global/quotas_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/rename_buildpack_command_test.go b/integration/v6/global/rename_buildpack_command_test.go index ab199cdba80..2568f34adc4 100644 --- a/integration/v6/global/rename_buildpack_command_test.go +++ b/integration/v6/global/rename_buildpack_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/set_org_role_command_test.go b/integration/v6/global/set_org_role_command_test.go index f9391b46434..4682993512a 100644 --- a/integration/v6/global/set_org_role_command_test.go +++ b/integration/v6/global/set_org_role_command_test.go @@ -1,7 +1,7 @@ package global import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/set_running_environment_variable_group_command_test.go b/integration/v6/global/set_running_environment_variable_group_command_test.go index e077e03ea98..6241705147f 100644 --- a/integration/v6/global/set_running_environment_variable_group_command_test.go +++ b/integration/v6/global/set_running_environment_variable_group_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/set_space_role_command_test.go b/integration/v6/global/set_space_role_command_test.go index f4a5fecc787..eb52522e483 100644 --- a/integration/v6/global/set_space_role_command_test.go +++ b/integration/v6/global/set_space_role_command_test.go @@ -1,7 +1,7 @@ package global import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/set_staging_environment_variable_group_command_test.go b/integration/v6/global/set_staging_environment_variable_group_command_test.go index a746cd7e64f..8dfa7aa20b6 100644 --- a/integration/v6/global/set_staging_environment_variable_group_command_test.go +++ b/integration/v6/global/set_staging_environment_variable_group_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/global/update_buildpack_command_test.go b/integration/v6/global/update_buildpack_command_test.go index 01ea31d6cb1..8a65efad1ab 100644 --- a/integration/v6/global/update_buildpack_command_test.go +++ b/integration/v6/global/update_buildpack_command_test.go @@ -9,7 +9,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/add_network_policy_command_test.go b/integration/v6/isolated/add_network_policy_command_test.go index 55bb2b94305..b8e33983cb3 100644 --- a/integration/v6/isolated/add_network_policy_command_test.go +++ b/integration/v6/isolated/add_network_policy_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/api_command_test.go b/integration/v6/isolated/api_command_test.go index 657dbb45681..c68edd67a7e 100644 --- a/integration/v6/isolated/api_command_test.go +++ b/integration/v6/isolated/api_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/app_command_test.go b/integration/v6/isolated/app_command_test.go index a3f9585b877..d1a6f1803a9 100644 --- a/integration/v6/isolated/app_command_test.go +++ b/integration/v6/isolated/app_command_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/bind_route_service_command_test.go b/integration/v6/isolated/bind_route_service_command_test.go index f025f7931e2..685e3095e76 100644 --- a/integration/v6/isolated/bind_route_service_command_test.go +++ b/integration/v6/isolated/bind_route_service_command_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/bind_running_security_group_command_test.go b/integration/v6/isolated/bind_running_security_group_command_test.go index 411a7d0eb44..6f94a06440b 100644 --- a/integration/v6/isolated/bind_running_security_group_command_test.go +++ b/integration/v6/isolated/bind_running_security_group_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/bind_security_group_command_test.go b/integration/v6/isolated/bind_security_group_command_test.go index a9a5013436c..f690e07a0ef 100644 --- a/integration/v6/isolated/bind_security_group_command_test.go +++ b/integration/v6/isolated/bind_security_group_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/check_route_command_test.go b/integration/v6/isolated/check_route_command_test.go index f57aea46cd6..d9e2ddb4bfb 100644 --- a/integration/v6/isolated/check_route_command_test.go +++ b/integration/v6/isolated/check_route_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/config_command_test.go b/integration/v6/isolated/config_command_test.go index 979b8578dcb..054af339e0e 100644 --- a/integration/v6/isolated/config_command_test.go +++ b/integration/v6/isolated/config_command_test.go @@ -4,8 +4,7 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "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/integration/v6/isolated/copy_source_command_test.go b/integration/v6/isolated/copy_source_command_test.go index 06228878476..541aac1f2b2 100644 --- a/integration/v6/isolated/copy_source_command_test.go +++ b/integration/v6/isolated/copy_source_command_test.go @@ -6,7 +6,7 @@ import ( "net/http" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_app_manifest_command_test.go b/integration/v6/isolated/create_app_manifest_command_test.go index 754065bca88..7201afb78c5 100644 --- a/integration/v6/isolated/create_app_manifest_command_test.go +++ b/integration/v6/isolated/create_app_manifest_command_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_isolation_segment_command_test.go b/integration/v6/isolated/create_isolation_segment_command_test.go index 2bcea0d4395..2a73c0e05a9 100644 --- a/integration/v6/isolated/create_isolation_segment_command_test.go +++ b/integration/v6/isolated/create_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_org_command_test.go b/integration/v6/isolated/create_org_command_test.go index 2fd00e68b12..5f0d6883b12 100644 --- a/integration/v6/isolated/create_org_command_test.go +++ b/integration/v6/isolated/create_org_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_quota_command_test.go b/integration/v6/isolated/create_quota_command_test.go index c689fe19d53..ed3b78bb0e1 100644 --- a/integration/v6/isolated/create_quota_command_test.go +++ b/integration/v6/isolated/create_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_route_command_test.go b/integration/v6/isolated/create_route_command_test.go index cc748db1e3c..10e0188aef9 100644 --- a/integration/v6/isolated/create_route_command_test.go +++ b/integration/v6/isolated/create_route_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_shared_domain_test.go b/integration/v6/isolated/create_shared_domain_test.go index 58b6f66b0b4..a6364c8669b 100644 --- a/integration/v6/isolated/create_shared_domain_test.go +++ b/integration/v6/isolated/create_shared_domain_test.go @@ -5,7 +5,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_space_command_test.go b/integration/v6/isolated/create_space_command_test.go index b190e88b17f..cacc62af86b 100644 --- a/integration/v6/isolated/create_space_command_test.go +++ b/integration/v6/isolated/create_space_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_space_quota_command_test.go b/integration/v6/isolated/create_space_quota_command_test.go index 340aec386d7..ec7fbc5bee5 100644 --- a/integration/v6/isolated/create_space_quota_command_test.go +++ b/integration/v6/isolated/create_space_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/create_user_command_test.go b/integration/v6/isolated/create_user_command_test.go index ff2ad6e3bfb..0dc4611e8ed 100644 --- a/integration/v6/isolated/create_user_command_test.go +++ b/integration/v6/isolated/create_user_command_test.go @@ -2,8 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/curl_command_test.go b/integration/v6/isolated/curl_command_test.go index dea2abad87e..3454bd3bb8c 100644 --- a/integration/v6/isolated/curl_command_test.go +++ b/integration/v6/isolated/curl_command_test.go @@ -9,7 +9,7 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_command_test.go b/integration/v6/isolated/delete_command_test.go index ee1315aed66..e540c2cad17 100644 --- a/integration/v6/isolated/delete_command_test.go +++ b/integration/v6/isolated/delete_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_isolation_segment_command_test.go b/integration/v6/isolated/delete_isolation_segment_command_test.go index 7c34c92ece6..d6869e814bb 100644 --- a/integration/v6/isolated/delete_isolation_segment_command_test.go +++ b/integration/v6/isolated/delete_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_org_command_test.go b/integration/v6/isolated/delete_org_command_test.go index 4e6248be708..31573f7d94c 100644 --- a/integration/v6/isolated/delete_org_command_test.go +++ b/integration/v6/isolated/delete_org_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_orphaned_routes_command_test.go b/integration/v6/isolated/delete_orphaned_routes_command_test.go index b4102e32d22..1a3be5881c1 100644 --- a/integration/v6/isolated/delete_orphaned_routes_command_test.go +++ b/integration/v6/isolated/delete_orphaned_routes_command_test.go @@ -5,7 +5,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_quota_command_test.go b/integration/v6/isolated/delete_quota_command_test.go index 78d1df599b8..aa2d6759186 100644 --- a/integration/v6/isolated/delete_quota_command_test.go +++ b/integration/v6/isolated/delete_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_security_group_command_test.go b/integration/v6/isolated/delete_security_group_command_test.go index 91a2c3e05c3..8e02a939e9c 100644 --- a/integration/v6/isolated/delete_security_group_command_test.go +++ b/integration/v6/isolated/delete_security_group_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_space_command_test.go b/integration/v6/isolated/delete_space_command_test.go index e2bf97f5631..1abdc8a31eb 100644 --- a/integration/v6/isolated/delete_space_command_test.go +++ b/integration/v6/isolated/delete_space_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_space_quota_command_test.go b/integration/v6/isolated/delete_space_quota_command_test.go index 45107ac4218..b8eb7d69d77 100644 --- a/integration/v6/isolated/delete_space_quota_command_test.go +++ b/integration/v6/isolated/delete_space_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/delete_user_command_test.go b/integration/v6/isolated/delete_user_command_test.go index 81fb7c06c75..fbaf32a672d 100644 --- a/integration/v6/isolated/delete_user_command_test.go +++ b/integration/v6/isolated/delete_user_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/disable_feature_flag_command_test.go b/integration/v6/isolated/disable_feature_flag_command_test.go index 3442574c4f8..46258c89e0a 100644 --- a/integration/v6/isolated/disable_feature_flag_command_test.go +++ b/integration/v6/isolated/disable_feature_flag_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/disable_org_isolation_command_test.go b/integration/v6/isolated/disable_org_isolation_command_test.go index 943ef2e2f33..bb47b2d7571 100644 --- a/integration/v6/isolated/disable_org_isolation_command_test.go +++ b/integration/v6/isolated/disable_org_isolation_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/disable_service_access_command_test.go b/integration/v6/isolated/disable_service_access_command_test.go index 0acffac547d..24bf580065b 100644 --- a/integration/v6/isolated/disable_service_access_command_test.go +++ b/integration/v6/isolated/disable_service_access_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/disallow_ssh_command_test.go b/integration/v6/isolated/disallow_ssh_command_test.go index 22bde93ea5f..8629cde8af7 100644 --- a/integration/v6/isolated/disallow_ssh_command_test.go +++ b/integration/v6/isolated/disallow_ssh_command_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/domains_command_test.go b/integration/v6/isolated/domains_command_test.go index 5be266e4a44..9e0c7cd5ec1 100644 --- a/integration/v6/isolated/domains_command_test.go +++ b/integration/v6/isolated/domains_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/enable_feature_flag_command_test.go b/integration/v6/isolated/enable_feature_flag_command_test.go index 28fc548aa91..d4dd4bcac17 100644 --- a/integration/v6/isolated/enable_feature_flag_command_test.go +++ b/integration/v6/isolated/enable_feature_flag_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/enable_org_isolation_command_test.go b/integration/v6/isolated/enable_org_isolation_command_test.go index c295d97e567..5f8ded92b22 100644 --- a/integration/v6/isolated/enable_org_isolation_command_test.go +++ b/integration/v6/isolated/enable_org_isolation_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/enable_service_access_command_test.go b/integration/v6/isolated/enable_service_access_command_test.go index 127d086a569..2ff4a84b8a5 100644 --- a/integration/v6/isolated/enable_service_access_command_test.go +++ b/integration/v6/isolated/enable_service_access_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/feature_flag_command_test.go b/integration/v6/isolated/feature_flag_command_test.go index 5e135045ace..24fb9bc215e 100644 --- a/integration/v6/isolated/feature_flag_command_test.go +++ b/integration/v6/isolated/feature_flag_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/feature_flags_command_test.go b/integration/v6/isolated/feature_flags_command_test.go index 8eedb4120b8..5086f76f58e 100644 --- a/integration/v6/isolated/feature_flags_command_test.go +++ b/integration/v6/isolated/feature_flags_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/get_health_check_command_test.go b/integration/v6/isolated/get_health_check_command_test.go index a0f858f1df6..2a05de998fd 100644 --- a/integration/v6/isolated/get_health_check_command_test.go +++ b/integration/v6/isolated/get_health_check_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/help_command_test.go b/integration/v6/isolated/help_command_test.go index 4b720597093..eabf3444816 100644 --- a/integration/v6/isolated/help_command_test.go +++ b/integration/v6/isolated/help_command_test.go @@ -5,8 +5,7 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/isolation_segments_command_test.go b/integration/v6/isolated/isolation_segments_command_test.go index bf9b3b93efc..79659770c60 100644 --- a/integration/v6/isolated/isolation_segments_command_test.go +++ b/integration/v6/isolated/isolation_segments_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/login_command_test.go b/integration/v6/isolated/login_command_test.go index 905381fa54d..02de6fddf6a 100644 --- a/integration/v6/isolated/login_command_test.go +++ b/integration/v6/isolated/login_command_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/logout_command_test.go b/integration/v6/isolated/logout_command_test.go index 00f11eafe01..5b86aa0c15d 100644 --- a/integration/v6/isolated/logout_command_test.go +++ b/integration/v6/isolated/logout_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/logs_command_test.go b/integration/v6/isolated/logs_command_test.go index e20b40819c0..b41819adf8d 100644 --- a/integration/v6/isolated/logs_command_test.go +++ b/integration/v6/isolated/logs_command_test.go @@ -8,7 +8,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/marketplace_command_test.go b/integration/v6/isolated/marketplace_command_test.go index e9e804fdf62..4b9963af87e 100644 --- a/integration/v6/isolated/marketplace_command_test.go +++ b/integration/v6/isolated/marketplace_command_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/network_policies_command_test.go b/integration/v6/isolated/network_policies_command_test.go index c7dd025a903..14d135b9257 100644 --- a/integration/v6/isolated/network_policies_command_test.go +++ b/integration/v6/isolated/network_policies_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/oauth_client_test.go b/integration/v6/isolated/oauth_client_test.go index 258e1a6ec5d..bc5b1150546 100644 --- a/integration/v6/isolated/oauth_client_test.go +++ b/integration/v6/isolated/oauth_client_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/oauth_token_command_test.go b/integration/v6/isolated/oauth_token_command_test.go index d356c993ce1..1b26968b9cb 100644 --- a/integration/v6/isolated/oauth_token_command_test.go +++ b/integration/v6/isolated/oauth_token_command_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/org_command_test.go b/integration/v6/isolated/org_command_test.go index 704e0b18be2..31ca28c47e9 100644 --- a/integration/v6/isolated/org_command_test.go +++ b/integration/v6/isolated/org_command_test.go @@ -4,7 +4,7 @@ import ( "sort" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/org_users_command_test.go b/integration/v6/isolated/org_users_command_test.go index 35824da828f..a9ae250d78f 100644 --- a/integration/v6/isolated/org_users_command_test.go +++ b/integration/v6/isolated/org_users_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/orgs_command_test.go b/integration/v6/isolated/orgs_command_test.go index 1d3cda9c2d1..a8e0692e38b 100644 --- a/integration/v6/isolated/orgs_command_test.go +++ b/integration/v6/isolated/orgs_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/proxy_connection_test.go b/integration/v6/isolated/proxy_connection_test.go index 7e043873898..e528c01d352 100644 --- a/integration/v6/isolated/proxy_connection_test.go +++ b/integration/v6/isolated/proxy_connection_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/purge_service_offering_command_test.go b/integration/v6/isolated/purge_service_offering_command_test.go index d0033eac932..52ba82f3a92 100644 --- a/integration/v6/isolated/purge_service_offering_command_test.go +++ b/integration/v6/isolated/purge_service_offering_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/remove_network_policy_command_test.go b/integration/v6/isolated/remove_network_policy_command_test.go index 33e25745ad1..4938b34ac83 100644 --- a/integration/v6/isolated/remove_network_policy_command_test.go +++ b/integration/v6/isolated/remove_network_policy_command_test.go @@ -5,7 +5,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/rename_service_broker_command_test.go b/integration/v6/isolated/rename_service_broker_command_test.go index 65f6b1b4869..f960a0c3695 100644 --- a/integration/v6/isolated/rename_service_broker_command_test.go +++ b/integration/v6/isolated/rename_service_broker_command_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/reset_org_default_isolation_segment_command_test.go b/integration/v6/isolated/reset_org_default_isolation_segment_command_test.go index 656b938a999..b74720e5234 100644 --- a/integration/v6/isolated/reset_org_default_isolation_segment_command_test.go +++ b/integration/v6/isolated/reset_org_default_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/reset_space_isolation_segment_test.go b/integration/v6/isolated/reset_space_isolation_segment_test.go index 44f55e9caae..f563ae4f2e9 100644 --- a/integration/v6/isolated/reset_space_isolation_segment_test.go +++ b/integration/v6/isolated/reset_space_isolation_segment_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/restage_command_test.go b/integration/v6/isolated/restage_command_test.go index c83a3db4270..23dadd54221 100644 --- a/integration/v6/isolated/restage_command_test.go +++ b/integration/v6/isolated/restage_command_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/restart_command_test.go b/integration/v6/isolated/restart_command_test.go index df4bfa80a64..76424154b56 100644 --- a/integration/v6/isolated/restart_command_test.go +++ b/integration/v6/isolated/restart_command_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/run_task_command_test.go b/integration/v6/isolated/run_task_command_test.go index 9eae3ae03de..4b73d201715 100644 --- a/integration/v6/isolated/run_task_command_test.go +++ b/integration/v6/isolated/run_task_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/scale_command_test.go b/integration/v6/isolated/scale_command_test.go index edef7dd66e6..330e523db19 100644 --- a/integration/v6/isolated/scale_command_test.go +++ b/integration/v6/isolated/scale_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/security_groups_command_test.go b/integration/v6/isolated/security_groups_command_test.go index 341e3a36ffa..ab851b96c91 100644 --- a/integration/v6/isolated/security_groups_command_test.go +++ b/integration/v6/isolated/security_groups_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/service_access_command_test.go b/integration/v6/isolated/service_access_command_test.go index 706df8bd2a4..feb1c04d49b 100644 --- a/integration/v6/isolated/service_access_command_test.go +++ b/integration/v6/isolated/service_access_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/service_brokers_command_test.go b/integration/v6/isolated/service_brokers_command_test.go index b65455f8a72..66253e504bb 100644 --- a/integration/v6/isolated/service_brokers_command_test.go +++ b/integration/v6/isolated/service_brokers_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/set_env_command_test.go b/integration/v6/isolated/set_env_command_test.go index eff0c52e7b6..d69947c5350 100644 --- a/integration/v6/isolated/set_env_command_test.go +++ b/integration/v6/isolated/set_env_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/set_health_check_command_test.go b/integration/v6/isolated/set_health_check_command_test.go index 54e70db9ff5..ac153d290d4 100644 --- a/integration/v6/isolated/set_health_check_command_test.go +++ b/integration/v6/isolated/set_health_check_command_test.go @@ -2,8 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/set_org_default_isolation_segment_command_test.go b/integration/v6/isolated/set_org_default_isolation_segment_command_test.go index 441f01e9a47..82a5118613e 100644 --- a/integration/v6/isolated/set_org_default_isolation_segment_command_test.go +++ b/integration/v6/isolated/set_org_default_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/set_org_role_command_test.go b/integration/v6/isolated/set_org_role_command_test.go index 04f72e0605e..ba4bccd9095 100644 --- a/integration/v6/isolated/set_org_role_command_test.go +++ b/integration/v6/isolated/set_org_role_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/set_quota_command_test.go b/integration/v6/isolated/set_quota_command_test.go index c12f2bf45b4..922dd91e2ec 100644 --- a/integration/v6/isolated/set_quota_command_test.go +++ b/integration/v6/isolated/set_quota_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/set_space_isolation_segment_command_test.go b/integration/v6/isolated/set_space_isolation_segment_command_test.go index 4f10fdf88b5..6f96e8a2c11 100644 --- a/integration/v6/isolated/set_space_isolation_segment_command_test.go +++ b/integration/v6/isolated/set_space_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/set_space_quota_command_test.go b/integration/v6/isolated/set_space_quota_command_test.go index 92624ea6149..11c730b9a93 100644 --- a/integration/v6/isolated/set_space_quota_command_test.go +++ b/integration/v6/isolated/set_space_quota_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/set_space_role_command_test.go b/integration/v6/isolated/set_space_role_command_test.go index cc63652a1c0..2621a77c6bb 100644 --- a/integration/v6/isolated/set_space_role_command_test.go +++ b/integration/v6/isolated/set_space_role_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/space_command_test.go b/integration/v6/isolated/space_command_test.go index c39b53c18d3..5a605981071 100644 --- a/integration/v6/isolated/space_command_test.go +++ b/integration/v6/isolated/space_command_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/space_quotas_command_test.go b/integration/v6/isolated/space_quotas_command_test.go index b10f85be726..dcc9899736f 100644 --- a/integration/v6/isolated/space_quotas_command_test.go +++ b/integration/v6/isolated/space_quotas_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/space_ssh_allowed_command_test.go b/integration/v6/isolated/space_ssh_allowed_command_test.go index 47d4edea379..369682bd864 100644 --- a/integration/v6/isolated/space_ssh_allowed_command_test.go +++ b/integration/v6/isolated/space_ssh_allowed_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/space_users_command_test.go b/integration/v6/isolated/space_users_command_test.go index 2e873bfd102..1e66051d74a 100644 --- a/integration/v6/isolated/space_users_command_test.go +++ b/integration/v6/isolated/space_users_command_test.go @@ -1,7 +1,7 @@ package isolated import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/spaces_command_test.go b/integration/v6/isolated/spaces_command_test.go index f713ff54f8e..d5dd929c90a 100644 --- a/integration/v6/isolated/spaces_command_test.go +++ b/integration/v6/isolated/spaces_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/ssh_code_command_test.go b/integration/v6/isolated/ssh_code_command_test.go index 54316f2e638..2866e47d449 100644 --- a/integration/v6/isolated/ssh_code_command_test.go +++ b/integration/v6/isolated/ssh_code_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/ssh_command_test.go b/integration/v6/isolated/ssh_command_test.go index 0a3d7060ce9..4b349c1782e 100644 --- a/integration/v6/isolated/ssh_command_test.go +++ b/integration/v6/isolated/ssh_command_test.go @@ -9,7 +9,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/ssh_enabled_command_test.go b/integration/v6/isolated/ssh_enabled_command_test.go index 69fa67929ec..48d402fd003 100644 --- a/integration/v6/isolated/ssh_enabled_command_test.go +++ b/integration/v6/isolated/ssh_enabled_command_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/start_command_test.go b/integration/v6/isolated/start_command_test.go index e86b7013759..1b109da3729 100644 --- a/integration/v6/isolated/start_command_test.go +++ b/integration/v6/isolated/start_command_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/suggest_command_test.go b/integration/v6/isolated/suggest_command_test.go index c0a0dccb83b..da88a9bf133 100644 --- a/integration/v6/isolated/suggest_command_test.go +++ b/integration/v6/isolated/suggest_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "os/exec" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/table_alignment_test.go b/integration/v6/isolated/table_alignment_test.go index 3b67baf6e9f..7c4bfe71872 100644 --- a/integration/v6/isolated/table_alignment_test.go +++ b/integration/v6/isolated/table_alignment_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/target_command_test.go b/integration/v6/isolated/target_command_test.go index 9a3c1315955..da13fa77e03 100644 --- a/integration/v6/isolated/target_command_test.go +++ b/integration/v6/isolated/target_command_test.go @@ -3,8 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/tasks_command_test.go b/integration/v6/isolated/tasks_command_test.go index b4e92c78954..a93130e1377 100644 --- a/integration/v6/isolated/tasks_command_test.go +++ b/integration/v6/isolated/tasks_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/terminate_task_command_test.go b/integration/v6/isolated/terminate_task_command_test.go index c0a5571ac29..8c67f11547a 100644 --- a/integration/v6/isolated/terminate_task_command_test.go +++ b/integration/v6/isolated/terminate_task_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/token_refresh_test.go b/integration/v6/isolated/token_refresh_test.go index 4956a382591..48cc4fd94dd 100644 --- a/integration/v6/isolated/token_refresh_test.go +++ b/integration/v6/isolated/token_refresh_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/unbind_running_security_group_command_test.go b/integration/v6/isolated/unbind_running_security_group_command_test.go index 9baf1309da7..617f8990e14 100644 --- a/integration/v6/isolated/unbind_running_security_group_command_test.go +++ b/integration/v6/isolated/unbind_running_security_group_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/unbind_security_group_command_test.go b/integration/v6/isolated/unbind_security_group_command_test.go index 2cfe1bd6d4a..67463dceedb 100644 --- a/integration/v6/isolated/unbind_security_group_command_test.go +++ b/integration/v6/isolated/unbind_security_group_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/unset_env_command_test.go b/integration/v6/isolated/unset_env_command_test.go index 98a7e52db1b..8b62f7dfaa4 100644 --- a/integration/v6/isolated/unset_env_command_test.go +++ b/integration/v6/isolated/unset_env_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/unset_space_quota_command_test.go b/integration/v6/isolated/unset_space_quota_command_test.go index 338ebd99bd1..de96ab6e036 100644 --- a/integration/v6/isolated/unset_space_quota_command_test.go +++ b/integration/v6/isolated/unset_space_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/update_quota_command_test.go b/integration/v6/isolated/update_quota_command_test.go index e8daed772b4..ae886317c28 100644 --- a/integration/v6/isolated/update_quota_command_test.go +++ b/integration/v6/isolated/update_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/update_security_group_command_test.go b/integration/v6/isolated/update_security_group_command_test.go index 0c58ef6c65a..6e6e7dbd0f6 100644 --- a/integration/v6/isolated/update_security_group_command_test.go +++ b/integration/v6/isolated/update_security_group_command_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/update_service_broker_command_test.go b/integration/v6/isolated/update_service_broker_command_test.go index 309b6c54231..c8ac2bc145e 100644 --- a/integration/v6/isolated/update_service_broker_command_test.go +++ b/integration/v6/isolated/update_service_broker_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/update_space_quota_command_test.go b/integration/v6/isolated/update_space_quota_command_test.go index 5f306c35791..530db843195 100644 --- a/integration/v6/isolated/update_space_quota_command_test.go +++ b/integration/v6/isolated/update_space_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/isolated/verbose_flag_test.go b/integration/v6/isolated/verbose_flag_test.go index 7cce298bac6..6d3ff0e1a87 100644 --- a/integration/v6/isolated/verbose_flag_test.go +++ b/integration/v6/isolated/verbose_flag_test.go @@ -10,8 +10,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/app_flags_test.go b/integration/v6/push/app_flags_test.go index 6c393935784..a584d3e38c5 100644 --- a/integration/v6/push/app_flags_test.go +++ b/integration/v6/push/app_flags_test.go @@ -6,7 +6,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/bind_to_services_in_manifest_test.go b/integration/v6/push/bind_to_services_in_manifest_test.go index 2a138fba36c..ec88c04e577 100644 --- a/integration/v6/push/bind_to_services_in_manifest_test.go +++ b/integration/v6/push/bind_to_services_in_manifest_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/buildpack_test.go b/integration/v6/push/buildpack_test.go index 217778ecced..94f8ad55d69 100644 --- a/integration/v6/push/buildpack_test.go +++ b/integration/v6/push/buildpack_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/combination_manifest_and_flag_test.go b/integration/v6/push/combination_manifest_and_flag_test.go index 3ec4b9e71d9..c19f38cdd52 100644 --- a/integration/v6/push/combination_manifest_and_flag_test.go +++ b/integration/v6/push/combination_manifest_and_flag_test.go @@ -7,8 +7,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/deprecated_route_flags_test.go b/integration/v6/push/deprecated_route_flags_test.go index 3ad58a6c7e9..19a2cb54819 100644 --- a/integration/v6/push/deprecated_route_flags_test.go +++ b/integration/v6/push/deprecated_route_flags_test.go @@ -5,7 +5,7 @@ import ( "os" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/docker_test.go b/integration/v6/push/docker_test.go index 7c504ba46f7..182b3437f56 100644 --- a/integration/v6/push/docker_test.go +++ b/integration/v6/push/docker_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/domain_test.go b/integration/v6/push/domain_test.go index 97e7c52e8bb..c63496520ea 100644 --- a/integration/v6/push/domain_test.go +++ b/integration/v6/push/domain_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/droplet_test.go b/integration/v6/push/droplet_test.go index c4fab3e513b..adc995e365e 100644 --- a/integration/v6/push/droplet_test.go +++ b/integration/v6/push/droplet_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/flag_error_test.go b/integration/v6/push/flag_error_test.go index 54b17a2e13f..dd01d80e8e1 100644 --- a/integration/v6/push/flag_error_test.go +++ b/integration/v6/push/flag_error_test.go @@ -3,8 +3,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/health_check_test.go b/integration/v6/push/health_check_test.go index 7fe2c2f28d2..88f14dc4350 100644 --- a/integration/v6/push/health_check_test.go +++ b/integration/v6/push/health_check_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/help_test.go b/integration/v6/push/help_test.go index 290d6cf799f..35bbed869b5 100644 --- a/integration/v6/push/help_test.go +++ b/integration/v6/push/help_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/hostname_only_routing_test.go b/integration/v6/push/hostname_only_routing_test.go index 5a1107598fd..ec62123b922 100644 --- a/integration/v6/push/hostname_only_routing_test.go +++ b/integration/v6/push/hostname_only_routing_test.go @@ -5,7 +5,7 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/http_random_route_test.go b/integration/v6/push/http_random_route_test.go index 7f86c8d1a9e..77157d05536 100644 --- a/integration/v6/push/http_random_route_test.go +++ b/integration/v6/push/http_random_route_test.go @@ -4,7 +4,7 @@ import ( "path" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/http_routes_in_manifest_test.go b/integration/v6/push/http_routes_in_manifest_test.go index c74810ecb93..21de195c1ec 100644 --- a/integration/v6/push/http_routes_in_manifest_test.go +++ b/integration/v6/push/http_routes_in_manifest_test.go @@ -5,7 +5,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/ignore_app_files_test.go b/integration/v6/push/ignore_app_files_test.go index ae10de98301..2e6eac636dd 100644 --- a/integration/v6/push/ignore_app_files_test.go +++ b/integration/v6/push/ignore_app_files_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/instances_test.go b/integration/v6/push/instances_test.go index 046a4787936..5be4717cf01 100644 --- a/integration/v6/push/instances_test.go +++ b/integration/v6/push/instances_test.go @@ -3,7 +3,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/interpolate_manifest_test.go b/integration/v6/push/interpolate_manifest_test.go index 882563771ad..af468b04c02 100644 --- a/integration/v6/push/interpolate_manifest_test.go +++ b/integration/v6/push/interpolate_manifest_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/interpolate_manifest_unix_test.go b/integration/v6/push/interpolate_manifest_unix_test.go index 255086d7598..6ab477a2f2c 100644 --- a/integration/v6/push/interpolate_manifest_unix_test.go +++ b/integration/v6/push/interpolate_manifest_unix_test.go @@ -12,7 +12,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/multiple_apps_in_manifest_test.go b/integration/v6/push/multiple_apps_in_manifest_test.go index 306f05a7d8f..6b9ec708312 100644 --- a/integration/v6/push/multiple_apps_in_manifest_test.go +++ b/integration/v6/push/multiple_apps_in_manifest_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/name_only_client_credentials_test.go b/integration/v6/push/name_only_client_credentials_test.go index 9bba5a3d64b..f22d7d36fd8 100644 --- a/integration/v6/push/name_only_client_credentials_test.go +++ b/integration/v6/push/name_only_client_credentials_test.go @@ -3,7 +3,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/name_only_test.go b/integration/v6/push/name_only_test.go index b0517406442..c28cac2b7e2 100644 --- a/integration/v6/push/name_only_test.go +++ b/integration/v6/push/name_only_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/no_hostname_test.go b/integration/v6/push/no_hostname_test.go index cc645a553a5..338ade6adda 100644 --- a/integration/v6/push/no_hostname_test.go +++ b/integration/v6/push/no_hostname_test.go @@ -3,7 +3,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/no_route_test.go b/integration/v6/push/no_route_test.go index fffb6cf7e57..f94197f239c 100644 --- a/integration/v6/push/no_route_test.go +++ b/integration/v6/push/no_route_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/no_start_test.go b/integration/v6/push/no_start_test.go index 5d7437a5a62..6f1813fc032 100644 --- a/integration/v6/push/no_start_test.go +++ b/integration/v6/push/no_start_test.go @@ -3,7 +3,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/path_only_routing_test.go b/integration/v6/push/path_only_routing_test.go index 71af6492fd6..0ed7414acc1 100644 --- a/integration/v6/push/path_only_routing_test.go +++ b/integration/v6/push/path_only_routing_test.go @@ -5,7 +5,7 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/path_test.go b/integration/v6/push/path_test.go index 6ba90c383aa..030d22f1187 100644 --- a/integration/v6/push/path_test.go +++ b/integration/v6/push/path_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/path_windows_test.go b/integration/v6/push/path_windows_test.go index d5ddd7ea9b4..3a93eac0d7a 100644 --- a/integration/v6/push/path_windows_test.go +++ b/integration/v6/push/path_windows_test.go @@ -9,7 +9,7 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/push_suite_test.go b/integration/v6/push/push_suite_test.go index 45e76951e8c..c0f6b4ce169 100644 --- a/integration/v6/push/push_suite_test.go +++ b/integration/v6/push/push_suite_test.go @@ -8,7 +8,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v6/push/resource_matching_test.go b/integration/v6/push/resource_matching_test.go index ffafedb1723..387151b61f8 100644 --- a/integration/v6/push/resource_matching_test.go +++ b/integration/v6/push/resource_matching_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/select_app_to_push_from_manifest_test.go b/integration/v6/push/select_app_to_push_from_manifest_test.go index 1291a803099..17f39686985 100644 --- a/integration/v6/push/select_app_to_push_from_manifest_test.go +++ b/integration/v6/push/select_app_to_push_from_manifest_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/simple_manifest_only_test.go b/integration/v6/push/simple_manifest_only_test.go index c0e750141cf..1fce4441236 100644 --- a/integration/v6/push/simple_manifest_only_test.go +++ b/integration/v6/push/simple_manifest_only_test.go @@ -7,7 +7,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/start_command_test.go b/integration/v6/push/start_command_test.go index 10ed2202c69..ada96735017 100644 --- a/integration/v6/push/start_command_test.go +++ b/integration/v6/push/start_command_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/symlink_resources_test.go b/integration/v6/push/symlink_resources_test.go index ee2918c3dc7..e2413af8a59 100644 --- a/integration/v6/push/symlink_resources_test.go +++ b/integration/v6/push/symlink_resources_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v6/push/symlink_test.go b/integration/v6/push/symlink_test.go index b8bd2c54f3e..2ad62a066fc 100644 --- a/integration/v6/push/symlink_test.go +++ b/integration/v6/push/symlink_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v6/push/target_check_test.go b/integration/v6/push/target_check_test.go index bb4b4f25a47..f920006eff3 100644 --- a/integration/v6/push/target_check_test.go +++ b/integration/v6/push/target_check_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/tcp_random_route_test.go b/integration/v6/push/tcp_random_route_test.go index b957c400e60..3b5f74d42c0 100644 --- a/integration/v6/push/tcp_random_route_test.go +++ b/integration/v6/push/tcp_random_route_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/tcp_routes_in_manifest_test.go b/integration/v6/push/tcp_routes_in_manifest_test.go index 76ec597b4d2..f84f908cea0 100644 --- a/integration/v6/push/tcp_routes_in_manifest_test.go +++ b/integration/v6/push/tcp_routes_in_manifest_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v6/push/trigger_legacy_push_test.go b/integration/v6/push/trigger_legacy_push_test.go index 402793b6ebc..91e1caf69a6 100644 --- a/integration/v6/push/trigger_legacy_push_test.go +++ b/integration/v6/push/trigger_legacy_push_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/bind_running_security_group_command_test.go b/integration/v7/global/bind_running_security_group_command_test.go index cc294c417d6..081d4407c99 100644 --- a/integration/v7/global/bind_running_security_group_command_test.go +++ b/integration/v7/global/bind_running_security_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/bind_security_group_command_test.go b/integration/v7/global/bind_security_group_command_test.go index cc881ecb38a..efba3e4f316 100644 --- a/integration/v7/global/bind_security_group_command_test.go +++ b/integration/v7/global/bind_security_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/bind_staging_security_group_command_test.go b/integration/v7/global/bind_staging_security_group_command_test.go index 460926466bd..ea120e6e91b 100644 --- a/integration/v7/global/bind_staging_security_group_command_test.go +++ b/integration/v7/global/bind_staging_security_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/create_buildpack_command_test.go b/integration/v7/global/create_buildpack_command_test.go index 3ec5cb2d6ee..f697e58bf03 100644 --- a/integration/v7/global/create_buildpack_command_test.go +++ b/integration/v7/global/create_buildpack_command_test.go @@ -9,7 +9,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/create_security_group_command_test.go b/integration/v7/global/create_security_group_command_test.go index 6a171f7a36b..e0ff1afed9b 100644 --- a/integration/v7/global/create_security_group_command_test.go +++ b/integration/v7/global/create_security_group_command_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/delete_buildpack_command_test.go b/integration/v7/global/delete_buildpack_command_test.go index 9ade0a8b247..b00775a7ce4 100644 --- a/integration/v7/global/delete_buildpack_command_test.go +++ b/integration/v7/global/delete_buildpack_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/disable_feature_flag_command_test.go b/integration/v7/global/disable_feature_flag_command_test.go index 840fc312c41..646f7063b41 100644 --- a/integration/v7/global/disable_feature_flag_command_test.go +++ b/integration/v7/global/disable_feature_flag_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/enable_feature_flag_command_test.go b/integration/v7/global/enable_feature_flag_command_test.go index 05526ae8271..fcda96b1789 100644 --- a/integration/v7/global/enable_feature_flag_command_test.go +++ b/integration/v7/global/enable_feature_flag_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/env_command_test.go b/integration/v7/global/env_command_test.go index 677b066aab6..bc029321593 100644 --- a/integration/v7/global/env_command_test.go +++ b/integration/v7/global/env_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/global_suite_test.go b/integration/v7/global/global_suite_test.go index 0b5c246a056..04e8be3c60b 100644 --- a/integration/v7/global/global_suite_test.go +++ b/integration/v7/global/global_suite_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/integration/v7/global/org_quota_command_test.go b/integration/v7/global/org_quota_command_test.go index 7161c979982..371d9d1aec8 100644 --- a/integration/v7/global/org_quota_command_test.go +++ b/integration/v7/global/org_quota_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/org_quotas_command_test.go b/integration/v7/global/org_quotas_command_test.go index f264c4ea438..3cdabe5f66e 100644 --- a/integration/v7/global/org_quotas_command_test.go +++ b/integration/v7/global/org_quotas_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/running_environment_variable_group_command_test.go b/integration/v7/global/running_environment_variable_group_command_test.go index 892f0ddb873..6da1c04182d 100644 --- a/integration/v7/global/running_environment_variable_group_command_test.go +++ b/integration/v7/global/running_environment_variable_group_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/running_security_groups_command_test.go b/integration/v7/global/running_security_groups_command_test.go index 8fcb31b45cb..e253e821d98 100644 --- a/integration/v7/global/running_security_groups_command_test.go +++ b/integration/v7/global/running_security_groups_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/security_group_command_test.go b/integration/v7/global/security_group_command_test.go index 5b12514f659..782d05fe036 100644 --- a/integration/v7/global/security_group_command_test.go +++ b/integration/v7/global/security_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/service_command_test.go b/integration/v7/global/service_command_test.go index 3313d4c109e..56910161b06 100644 --- a/integration/v7/global/service_command_test.go +++ b/integration/v7/global/service_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/set_org_role_command_test.go b/integration/v7/global/set_org_role_command_test.go index 843581fcdb9..12a5739aed0 100644 --- a/integration/v7/global/set_org_role_command_test.go +++ b/integration/v7/global/set_org_role_command_test.go @@ -1,7 +1,7 @@ package global import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/set_running_environment_variable_group_command_test.go b/integration/v7/global/set_running_environment_variable_group_command_test.go index bc433f82c4b..eef6f8c5867 100644 --- a/integration/v7/global/set_running_environment_variable_group_command_test.go +++ b/integration/v7/global/set_running_environment_variable_group_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/set_space_role_command_test.go b/integration/v7/global/set_space_role_command_test.go index 49423502bf1..9e2f99df4e2 100644 --- a/integration/v7/global/set_space_role_command_test.go +++ b/integration/v7/global/set_space_role_command_test.go @@ -1,7 +1,7 @@ package global import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/set_staging_environment_variable_group_command_test.go b/integration/v7/global/set_staging_environment_variable_group_command_test.go index 44f406f1147..05a1e79aa2b 100644 --- a/integration/v7/global/set_staging_environment_variable_group_command_test.go +++ b/integration/v7/global/set_staging_environment_variable_group_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/share_service_command_test.go b/integration/v7/global/share_service_command_test.go index 3cebee9b28c..6168ff719fe 100644 --- a/integration/v7/global/share_service_command_test.go +++ b/integration/v7/global/share_service_command_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/staging_environment_variable_group_command_test.go b/integration/v7/global/staging_environment_variable_group_command_test.go index de2192dfde5..bb03b84dcf8 100644 --- a/integration/v7/global/staging_environment_variable_group_command_test.go +++ b/integration/v7/global/staging_environment_variable_group_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/staging_security_groups_command_test.go b/integration/v7/global/staging_security_groups_command_test.go index 05145368cf7..49049c28379 100644 --- a/integration/v7/global/staging_security_groups_command_test.go +++ b/integration/v7/global/staging_security_groups_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/unbind_running_security_group_command_test.go b/integration/v7/global/unbind_running_security_group_command_test.go index 73d3c8c9e17..ef2c8a4b5fd 100644 --- a/integration/v7/global/unbind_running_security_group_command_test.go +++ b/integration/v7/global/unbind_running_security_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/unbind_security_group_command_test.go b/integration/v7/global/unbind_security_group_command_test.go index c42bbdc5152..18af34f653d 100644 --- a/integration/v7/global/unbind_security_group_command_test.go +++ b/integration/v7/global/unbind_security_group_command_test.go @@ -2,7 +2,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/unbind_staging_security_group_command_test.go b/integration/v7/global/unbind_staging_security_group_command_test.go index 19916d0e063..9a28ea277c4 100644 --- a/integration/v7/global/unbind_staging_security_group_command_test.go +++ b/integration/v7/global/unbind_staging_security_group_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/unshare_service_command_test.go b/integration/v7/global/unshare_service_command_test.go index 12b706e0934..d20ca2c4c04 100644 --- a/integration/v7/global/unshare_service_command_test.go +++ b/integration/v7/global/unshare_service_command_test.go @@ -3,7 +3,7 @@ package global import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/update_buildpack_command_test.go b/integration/v7/global/update_buildpack_command_test.go index e3dbfda1828..7780ca36b0e 100644 --- a/integration/v7/global/update_buildpack_command_test.go +++ b/integration/v7/global/update_buildpack_command_test.go @@ -9,7 +9,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/global/update_security_group_command_test.go b/integration/v7/global/update_security_group_command_test.go index 57c7a9ffb44..44c2fc94a6b 100644 --- a/integration/v7/global/update_security_group_command_test.go +++ b/integration/v7/global/update_security_group_command_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/add_network_policy_command_test.go b/integration/v7/isolated/add_network_policy_command_test.go index 7accd458416..db2da6cb241 100644 --- a/integration/v7/isolated/add_network_policy_command_test.go +++ b/integration/v7/isolated/add_network_policy_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/allow_space_ssh_command_test.go b/integration/v7/isolated/allow_space_ssh_command_test.go index d80a460f386..c7fcabe338a 100644 --- a/integration/v7/isolated/allow_space_ssh_command_test.go +++ b/integration/v7/isolated/allow_space_ssh_command_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/api_command_test.go b/integration/v7/isolated/api_command_test.go index 49d6663d2c8..4520d04c2c8 100644 --- a/integration/v7/isolated/api_command_test.go +++ b/integration/v7/isolated/api_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/app_command_test.go b/integration/v7/isolated/app_command_test.go index 7eed60c44ce..0bf0faaa1f0 100644 --- a/integration/v7/isolated/app_command_test.go +++ b/integration/v7/isolated/app_command_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/apply_manifest_command_test.go b/integration/v7/isolated/apply_manifest_command_test.go index 9b290953bf0..d4af4288c2b 100644 --- a/integration/v7/isolated/apply_manifest_command_test.go +++ b/integration/v7/isolated/apply_manifest_command_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/apps_command_test.go b/integration/v7/isolated/apps_command_test.go index 727621e8d8c..d7ca99920f4 100644 --- a/integration/v7/isolated/apps_command_test.go +++ b/integration/v7/isolated/apps_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/auth_command_test.go b/integration/v7/isolated/auth_command_test.go index 26f60477a8e..fce6f1c01bf 100644 --- a/integration/v7/isolated/auth_command_test.go +++ b/integration/v7/isolated/auth_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/bind_service_command_test.go b/integration/v7/isolated/bind_service_command_test.go index b0b58c0c869..0c08b05b0ff 100644 --- a/integration/v7/isolated/bind_service_command_test.go +++ b/integration/v7/isolated/bind_service_command_test.go @@ -6,10 +6,9 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/buildpacks_command_test.go b/integration/v7/isolated/buildpacks_command_test.go index 4366190137b..9ddcd47bd9e 100644 --- a/integration/v7/isolated/buildpacks_command_test.go +++ b/integration/v7/isolated/buildpacks_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" @@ -58,7 +58,7 @@ var _ = Describe("buildpacks command", func() { positionRegex := `\d+` enabledRegex := `true` lockedRegex := `false` - stackRegex := `(cflinuxfs[23]|windows.+)` + stackRegex := `(cflinuxfs[234]|windows.+)` staticfileNameRegex := `staticfile_buildpack` // staticfileFileRegex := `staticfile[-_]buildpack-\S+` diff --git a/integration/v7/isolated/cancel_deployment_test.go b/integration/v7/isolated/cancel_deployment_test.go index 12f5e8d5ea3..7b0d4dc01ec 100644 --- a/integration/v7/isolated/cancel_deployment_test.go +++ b/integration/v7/isolated/cancel_deployment_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/check_route_command_test.go b/integration/v7/isolated/check_route_command_test.go index 21d2915e221..70067930741 100644 --- a/integration/v7/isolated/check_route_command_test.go +++ b/integration/v7/isolated/check_route_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/config_command_test.go b/integration/v7/isolated/config_command_test.go index f01c21d5da8..549af21a49f 100644 --- a/integration/v7/isolated/config_command_test.go +++ b/integration/v7/isolated/config_command_test.go @@ -4,8 +4,8 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/config_test.go b/integration/v7/isolated/config_test.go index caf5c0aff5f..985e3e40808 100644 --- a/integration/v7/isolated/config_test.go +++ b/integration/v7/isolated/config_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/integration/v7/isolated/copy_source_command_test.go b/integration/v7/isolated/copy_source_command_test.go index 4fb385cf4a5..cd5660e488b 100644 --- a/integration/v7/isolated/copy_source_command_test.go +++ b/integration/v7/isolated/copy_source_command_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_app_command_test.go b/integration/v7/isolated/create_app_command_test.go index d51842fb4dd..e10dc1872ea 100644 --- a/integration/v7/isolated/create_app_command_test.go +++ b/integration/v7/isolated/create_app_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_app_manifest_command_test.go b/integration/v7/isolated/create_app_manifest_command_test.go index 607d22f2116..fd8be4eaf0b 100644 --- a/integration/v7/isolated/create_app_manifest_command_test.go +++ b/integration/v7/isolated/create_app_manifest_command_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_isolation_segment_command_test.go b/integration/v7/isolated/create_isolation_segment_command_test.go index e74d5ae44da..5ed9ed9bd4b 100644 --- a/integration/v7/isolated/create_isolation_segment_command_test.go +++ b/integration/v7/isolated/create_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_org_command_test.go b/integration/v7/isolated/create_org_command_test.go index bcf40ecb8d6..3c6b1e2a14b 100644 --- a/integration/v7/isolated/create_org_command_test.go +++ b/integration/v7/isolated/create_org_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_org_quota_command_test.go b/integration/v7/isolated/create_org_quota_command_test.go index d9c858d695f..033b0aaca9b 100644 --- a/integration/v7/isolated/create_org_quota_command_test.go +++ b/integration/v7/isolated/create_org_quota_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_package_cfignore_test.go b/integration/v7/isolated/create_package_cfignore_test.go index d9b00745b0f..9641984ec0b 100644 --- a/integration/v7/isolated/create_package_cfignore_test.go +++ b/integration/v7/isolated/create_package_cfignore_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v7/isolated/create_package_command_test.go b/integration/v7/isolated/create_package_command_test.go index 891934d5d6c..9b890cc22cc 100644 --- a/integration/v7/isolated/create_package_command_test.go +++ b/integration/v7/isolated/create_package_command_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_private_domain_test.go b/integration/v7/isolated/create_private_domain_test.go index 6c2ce0ff687..84bb1ff88f9 100644 --- a/integration/v7/isolated/create_private_domain_test.go +++ b/integration/v7/isolated/create_private_domain_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_route_command_test.go b/integration/v7/isolated/create_route_command_test.go index 7c1a97dcf4d..60e64ba82a6 100644 --- a/integration/v7/isolated/create_route_command_test.go +++ b/integration/v7/isolated/create_route_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_service_broker_command_test.go b/integration/v7/isolated/create_service_broker_command_test.go index 7c5faf3e1e5..0507aed6319 100644 --- a/integration/v7/isolated/create_service_broker_command_test.go +++ b/integration/v7/isolated/create_service_broker_command_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_service_command_test.go b/integration/v7/isolated/create_service_command_test.go index ea471ec3cb2..1cf3f71431c 100644 --- a/integration/v7/isolated/create_service_command_test.go +++ b/integration/v7/isolated/create_service_command_test.go @@ -6,10 +6,9 @@ import ( "path/filepath" "time" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_service_key_command_test.go b/integration/v7/isolated/create_service_key_command_test.go index 57c28b4d982..e74dfc27ed9 100644 --- a/integration/v7/isolated/create_service_key_command_test.go +++ b/integration/v7/isolated/create_service_key_command_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_shared_domain_test.go b/integration/v7/isolated/create_shared_domain_test.go index 0d38e1ebc40..c16129dadef 100644 --- a/integration/v7/isolated/create_shared_domain_test.go +++ b/integration/v7/isolated/create_shared_domain_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_space_command_test.go b/integration/v7/isolated/create_space_command_test.go index 55af227a89e..7bb6115720a 100644 --- a/integration/v7/isolated/create_space_command_test.go +++ b/integration/v7/isolated/create_space_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_space_quota_command_test.go b/integration/v7/isolated/create_space_quota_command_test.go index 969a2a540dd..ae4413b1a42 100644 --- a/integration/v7/isolated/create_space_quota_command_test.go +++ b/integration/v7/isolated/create_space_quota_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/create_user_command_test.go b/integration/v7/isolated/create_user_command_test.go index 2123fb70d7a..6cda9958ee9 100644 --- a/integration/v7/isolated/create_user_command_test.go +++ b/integration/v7/isolated/create_user_command_test.go @@ -4,8 +4,8 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/curl_command_test.go b/integration/v7/isolated/curl_command_test.go index 68ccfb5be93..7be059a00a1 100644 --- a/integration/v7/isolated/curl_command_test.go +++ b/integration/v7/isolated/curl_command_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_command_test.go b/integration/v7/isolated/delete_command_test.go index 9d9e942dba1..829ab4f2515 100644 --- a/integration/v7/isolated/delete_command_test.go +++ b/integration/v7/isolated/delete_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_isolation_segment_command_test.go b/integration/v7/isolated/delete_isolation_segment_command_test.go index 7c34c92ece6..d6869e814bb 100644 --- a/integration/v7/isolated/delete_isolation_segment_command_test.go +++ b/integration/v7/isolated/delete_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_org_command_test.go b/integration/v7/isolated/delete_org_command_test.go index 231d3e7155f..f8134fd3d73 100644 --- a/integration/v7/isolated/delete_org_command_test.go +++ b/integration/v7/isolated/delete_org_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_org_quota_command_test.go b/integration/v7/isolated/delete_org_quota_command_test.go index 7ff2af4ae67..c0b613497af 100644 --- a/integration/v7/isolated/delete_org_quota_command_test.go +++ b/integration/v7/isolated/delete_org_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_orphaned_routes_command_test.go b/integration/v7/isolated/delete_orphaned_routes_command_test.go index e09b5c2911f..ca34b582531 100644 --- a/integration/v7/isolated/delete_orphaned_routes_command_test.go +++ b/integration/v7/isolated/delete_orphaned_routes_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_private_domain_command_test.go b/integration/v7/isolated/delete_private_domain_command_test.go index 1f17c1979f9..af707bd6a9a 100644 --- a/integration/v7/isolated/delete_private_domain_command_test.go +++ b/integration/v7/isolated/delete_private_domain_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_route_command_test.go b/integration/v7/isolated/delete_route_command_test.go index 8779dc98894..dbe2d96d61c 100644 --- a/integration/v7/isolated/delete_route_command_test.go +++ b/integration/v7/isolated/delete_route_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_security_group_command_test.go b/integration/v7/isolated/delete_security_group_command_test.go index 6cf0746204e..5a902dad8d9 100644 --- a/integration/v7/isolated/delete_security_group_command_test.go +++ b/integration/v7/isolated/delete_security_group_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_service_broker_command_test.go b/integration/v7/isolated/delete_service_broker_command_test.go index fb078ba3a59..a1808622113 100644 --- a/integration/v7/isolated/delete_service_broker_command_test.go +++ b/integration/v7/isolated/delete_service_broker_command_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_service_command_test.go b/integration/v7/isolated/delete_service_command_test.go index 6eac4cbc67d..665ef4b9a68 100644 --- a/integration/v7/isolated/delete_service_command_test.go +++ b/integration/v7/isolated/delete_service_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_shared_domain_command_test.go b/integration/v7/isolated/delete_shared_domain_command_test.go index e24f174c642..8740084568c 100644 --- a/integration/v7/isolated/delete_shared_domain_command_test.go +++ b/integration/v7/isolated/delete_shared_domain_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_space_command_test.go b/integration/v7/isolated/delete_space_command_test.go index 9c6201426c1..6538dcb2991 100644 --- a/integration/v7/isolated/delete_space_command_test.go +++ b/integration/v7/isolated/delete_space_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_space_quota_command_test.go b/integration/v7/isolated/delete_space_quota_command_test.go index 6874a03544e..bc5d0c884a5 100644 --- a/integration/v7/isolated/delete_space_quota_command_test.go +++ b/integration/v7/isolated/delete_space_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/delete_user_command_test.go b/integration/v7/isolated/delete_user_command_test.go index d1632ad3544..c5740557daf 100644 --- a/integration/v7/isolated/delete_user_command_test.go +++ b/integration/v7/isolated/delete_user_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/disable_org_isolation_command_test.go b/integration/v7/isolated/disable_org_isolation_command_test.go index 943ef2e2f33..bb47b2d7571 100644 --- a/integration/v7/isolated/disable_org_isolation_command_test.go +++ b/integration/v7/isolated/disable_org_isolation_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/disable_service_access_command_test.go b/integration/v7/isolated/disable_service_access_command_test.go index 60f4b0dc493..5fc0453f30b 100644 --- a/integration/v7/isolated/disable_service_access_command_test.go +++ b/integration/v7/isolated/disable_service_access_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/disable_ssh_command_test.go b/integration/v7/isolated/disable_ssh_command_test.go index d68dc0c58da..9de1ddbbafe 100644 --- a/integration/v7/isolated/disable_ssh_command_test.go +++ b/integration/v7/isolated/disable_ssh_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/disallow_space_ssh_command_test.go b/integration/v7/isolated/disallow_space_ssh_command_test.go index 9fad10a6263..cc1f3502e36 100644 --- a/integration/v7/isolated/disallow_space_ssh_command_test.go +++ b/integration/v7/isolated/disallow_space_ssh_command_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/domains_command_test.go b/integration/v7/isolated/domains_command_test.go index 1fe17725ad2..39ec17e2f41 100644 --- a/integration/v7/isolated/domains_command_test.go +++ b/integration/v7/isolated/domains_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/download_droplet_command_test.go b/integration/v7/isolated/download_droplet_command_test.go index 8f302b22792..6a701730c01 100644 --- a/integration/v7/isolated/download_droplet_command_test.go +++ b/integration/v7/isolated/download_droplet_command_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/droplets_command_test.go b/integration/v7/isolated/droplets_command_test.go index f9bc0d39d10..186700f08b5 100644 --- a/integration/v7/isolated/droplets_command_test.go +++ b/integration/v7/isolated/droplets_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/enable_org_isolation_command_test.go b/integration/v7/isolated/enable_org_isolation_command_test.go index c295d97e567..5f8ded92b22 100644 --- a/integration/v7/isolated/enable_org_isolation_command_test.go +++ b/integration/v7/isolated/enable_org_isolation_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/enable_service_access_command_test.go b/integration/v7/isolated/enable_service_access_command_test.go index 5aba18b603d..b315d00e10b 100644 --- a/integration/v7/isolated/enable_service_access_command_test.go +++ b/integration/v7/isolated/enable_service_access_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/enable_ssh_command_test.go b/integration/v7/isolated/enable_ssh_command_test.go index 7948361041b..014791f83b6 100644 --- a/integration/v7/isolated/enable_ssh_command_test.go +++ b/integration/v7/isolated/enable_ssh_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/error_on_extra_arguments_test.go b/integration/v7/isolated/error_on_extra_arguments_test.go index 1f437759cbe..712f9036f21 100644 --- a/integration/v7/isolated/error_on_extra_arguments_test.go +++ b/integration/v7/isolated/error_on_extra_arguments_test.go @@ -2,7 +2,8 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/events_command_test.go b/integration/v7/isolated/events_command_test.go index 7442cefaac5..9b6ddb295c5 100644 --- a/integration/v7/isolated/events_command_test.go +++ b/integration/v7/isolated/events_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/feature_flag_command_test.go b/integration/v7/isolated/feature_flag_command_test.go index ae1b10fd07c..bcec97a4bd6 100644 --- a/integration/v7/isolated/feature_flag_command_test.go +++ b/integration/v7/isolated/feature_flag_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/feature_flags_command_test.go b/integration/v7/isolated/feature_flags_command_test.go index 171d4628c5f..26f7c7e4c43 100644 --- a/integration/v7/isolated/feature_flags_command_test.go +++ b/integration/v7/isolated/feature_flags_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/get_health_check_command_test.go b/integration/v7/isolated/get_health_check_command_test.go index d3fcf3a680a..a1b64a9f566 100644 --- a/integration/v7/isolated/get_health_check_command_test.go +++ b/integration/v7/isolated/get_health_check_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/help_command_test.go b/integration/v7/isolated/help_command_test.go index 46db19f9a9b..43991701ea0 100644 --- a/integration/v7/isolated/help_command_test.go +++ b/integration/v7/isolated/help_command_test.go @@ -6,8 +6,8 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/isolation_segments_command_test.go b/integration/v7/isolated/isolation_segments_command_test.go index 7a598102eea..bb5243e785a 100644 --- a/integration/v7/isolated/isolation_segments_command_test.go +++ b/integration/v7/isolated/isolation_segments_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/labels_command_test.go b/integration/v7/isolated/labels_command_test.go index 06432ea378c..e0ae0ea8754 100644 --- a/integration/v7/isolated/labels_command_test.go +++ b/integration/v7/isolated/labels_command_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/login_command_test.go b/integration/v7/isolated/login_command_test.go index 6fff47c6316..820f46bce9e 100644 --- a/integration/v7/isolated/login_command_test.go +++ b/integration/v7/isolated/login_command_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/logout_command_test.go b/integration/v7/isolated/logout_command_test.go index fb8ab630ac3..e275aaed577 100644 --- a/integration/v7/isolated/logout_command_test.go +++ b/integration/v7/isolated/logout_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/logs_command_test.go b/integration/v7/isolated/logs_command_test.go index 398826540c0..a04ba1800c9 100644 --- a/integration/v7/isolated/logs_command_test.go +++ b/integration/v7/isolated/logs_command_test.go @@ -9,7 +9,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/map_route_command_test.go b/integration/v7/isolated/map_route_command_test.go index 5484eafc9d9..42be3469785 100644 --- a/integration/v7/isolated/map_route_command_test.go +++ b/integration/v7/isolated/map_route_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/marketplace_command_test.go b/integration/v7/isolated/marketplace_command_test.go index 37d6d069c6b..85f68089608 100644 --- a/integration/v7/isolated/marketplace_command_test.go +++ b/integration/v7/isolated/marketplace_command_test.go @@ -4,12 +4,10 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" - - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/network_policies_command_test.go b/integration/v7/isolated/network_policies_command_test.go index 2181839bdba..05469eccd89 100644 --- a/integration/v7/isolated/network_policies_command_test.go +++ b/integration/v7/isolated/network_policies_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/oauth_client_test.go b/integration/v7/isolated/oauth_client_test.go index 5cdeb54cb82..ccf182b5a86 100644 --- a/integration/v7/isolated/oauth_client_test.go +++ b/integration/v7/isolated/oauth_client_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/oauth_token_command_test.go b/integration/v7/isolated/oauth_token_command_test.go index 148e5f5df38..8cabb8b142b 100644 --- a/integration/v7/isolated/oauth_token_command_test.go +++ b/integration/v7/isolated/oauth_token_command_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/org_command_test.go b/integration/v7/isolated/org_command_test.go index d970a12074f..ddfece678e6 100644 --- a/integration/v7/isolated/org_command_test.go +++ b/integration/v7/isolated/org_command_test.go @@ -4,7 +4,7 @@ import ( "sort" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/org_users_command_test.go b/integration/v7/isolated/org_users_command_test.go index d2dfe13b272..f2f6ec63871 100644 --- a/integration/v7/isolated/org_users_command_test.go +++ b/integration/v7/isolated/org_users_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/orgs_command_test.go b/integration/v7/isolated/orgs_command_test.go index 2ff94fb174a..db77e0eac99 100644 --- a/integration/v7/isolated/orgs_command_test.go +++ b/integration/v7/isolated/orgs_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/packages_command_test.go b/integration/v7/isolated/packages_command_test.go index 83d65b59d7c..f81f6b47dcf 100644 --- a/integration/v7/isolated/packages_command_test.go +++ b/integration/v7/isolated/packages_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/passwd_command_test.go b/integration/v7/isolated/passwd_command_test.go index 30181f64574..f5caa3685fd 100644 --- a/integration/v7/isolated/passwd_command_test.go +++ b/integration/v7/isolated/passwd_command_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/proxy_connection_test.go b/integration/v7/isolated/proxy_connection_test.go index 20e332e90b6..afabd756184 100644 --- a/integration/v7/isolated/proxy_connection_test.go +++ b/integration/v7/isolated/proxy_connection_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/purge_service_offering_command_test.go b/integration/v7/isolated/purge_service_offering_command_test.go index 1aad71e6c58..38ee9f9a5c2 100644 --- a/integration/v7/isolated/purge_service_offering_command_test.go +++ b/integration/v7/isolated/purge_service_offering_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/remove_network_policy_command_test.go b/integration/v7/isolated/remove_network_policy_command_test.go index ffeb9369944..22c3871f7a0 100644 --- a/integration/v7/isolated/remove_network_policy_command_test.go +++ b/integration/v7/isolated/remove_network_policy_command_test.go @@ -5,7 +5,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/rename_command_test.go b/integration/v7/isolated/rename_command_test.go index bdcf63054f2..29e5d58eb2e 100644 --- a/integration/v7/isolated/rename_command_test.go +++ b/integration/v7/isolated/rename_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/rename_org_command_test.go b/integration/v7/isolated/rename_org_command_test.go index ecbda727b18..ad5accf8993 100644 --- a/integration/v7/isolated/rename_org_command_test.go +++ b/integration/v7/isolated/rename_org_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/rename_service_broker_command_test.go b/integration/v7/isolated/rename_service_broker_command_test.go index dc0e1a9fead..bac5aa88f2e 100644 --- a/integration/v7/isolated/rename_service_broker_command_test.go +++ b/integration/v7/isolated/rename_service_broker_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/rename_service_command_test.go b/integration/v7/isolated/rename_service_command_test.go index 08972d112d8..29a9e789ec0 100644 --- a/integration/v7/isolated/rename_service_command_test.go +++ b/integration/v7/isolated/rename_service_command_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccversion" "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/rename_space_command_test.go b/integration/v7/isolated/rename_space_command_test.go index 1896018d980..3360df69e44 100644 --- a/integration/v7/isolated/rename_space_command_test.go +++ b/integration/v7/isolated/rename_space_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/reset_org_default_isolation_segment_command_test.go b/integration/v7/isolated/reset_org_default_isolation_segment_command_test.go index 181ede0e070..2cd88a1505d 100644 --- a/integration/v7/isolated/reset_org_default_isolation_segment_command_test.go +++ b/integration/v7/isolated/reset_org_default_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/reset_space_isolation_segment_test.go b/integration/v7/isolated/reset_space_isolation_segment_test.go index 5891bfe2ae8..effd49f7260 100644 --- a/integration/v7/isolated/reset_space_isolation_segment_test.go +++ b/integration/v7/isolated/reset_space_isolation_segment_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/restage_command_test.go b/integration/v7/isolated/restage_command_test.go index 1306df7d2bd..7f63f55e08a 100644 --- a/integration/v7/isolated/restage_command_test.go +++ b/integration/v7/isolated/restage_command_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/restart_app_instance_command_test.go b/integration/v7/isolated/restart_app_instance_command_test.go index d9102949725..0958599b94a 100644 --- a/integration/v7/isolated/restart_app_instance_command_test.go +++ b/integration/v7/isolated/restart_app_instance_command_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/restart_command_test.go b/integration/v7/isolated/restart_command_test.go index 42bbd23c7a2..c0b52489dc9 100644 --- a/integration/v7/isolated/restart_command_test.go +++ b/integration/v7/isolated/restart_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/revision_command_test.go b/integration/v7/isolated/revision_command_test.go index 3daac4c21c4..47cf099fc4f 100644 --- a/integration/v7/isolated/revision_command_test.go +++ b/integration/v7/isolated/revision_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/revisions_command_test.go b/integration/v7/isolated/revisions_command_test.go index 8795bdb7479..c5816d0aa80 100644 --- a/integration/v7/isolated/revisions_command_test.go +++ b/integration/v7/isolated/revisions_command_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/rollback_command_test.go b/integration/v7/isolated/rollback_command_test.go index 458f3799274..b5523c40741 100644 --- a/integration/v7/isolated/rollback_command_test.go +++ b/integration/v7/isolated/rollback_command_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/router_groups_command_test.go b/integration/v7/isolated/router_groups_command_test.go index f4b5d3cd964..b49a79cf088 100644 --- a/integration/v7/isolated/router_groups_command_test.go +++ b/integration/v7/isolated/router_groups_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/routes_command_test.go b/integration/v7/isolated/routes_command_test.go index 64df282813f..07ab5e1dc91 100644 --- a/integration/v7/isolated/routes_command_test.go +++ b/integration/v7/isolated/routes_command_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/run_task_command_test.go b/integration/v7/isolated/run_task_command_test.go index 05ec1f3d159..c3da508db9e 100644 --- a/integration/v7/isolated/run_task_command_test.go +++ b/integration/v7/isolated/run_task_command_test.go @@ -5,7 +5,7 @@ import ( "path" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/scale_command_test.go b/integration/v7/isolated/scale_command_test.go index 06e21fea11f..65c9c8e2449 100644 --- a/integration/v7/isolated/scale_command_test.go +++ b/integration/v7/isolated/scale_command_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" @@ -130,8 +130,8 @@ var _ = Describe("scale command", func() { Expect(processSummary.InstanceCount).To(Equal("1/1")) instanceSummary := processSummary.Instances[0] - Expect(instanceSummary.Memory).To(MatchRegexp(`\d+(\.\d+)?[KMG]? of \d+[KMG]`)) - Expect(instanceSummary.Disk).To(MatchRegexp(`\d+(\.\d+)?[KMG]? of \d+[KMG]`)) + Expect(instanceSummary.Memory).To(MatchRegexp(`\d+(\.\d+)?[BKMG]? of \d+?[BKMG]?`)) + Expect(instanceSummary.Disk).To(MatchRegexp(`\d+(\.\d+)?[BKMG]? of \d+?[BKMG]?`)) Expect(appTable.Processes[1].Type).To(Equal("console")) Expect(appTable.Processes[1].InstanceCount).To(Equal("0/0")) @@ -172,8 +172,8 @@ var _ = Describe("scale command", func() { instanceSummary := processSummary.Instances[0] Expect(processSummary.Type).To(Equal("web")) Expect(processSummary.InstanceCount).To(MatchRegexp(`\d/3`)) - Expect(instanceSummary.Disk).To(MatchRegexp(`\d+(\.\d+)?[KMG]? of \d+[KMG]`)) - Expect(instanceSummary.Memory).To(MatchRegexp(`\d+(\.\d+)?[KMG]? of \d+[KMG]`)) + Expect(instanceSummary.Disk).To(MatchRegexp(`\d+(\.\d+)?[BKMG]? of \d+[BKMG]`)) + Expect(instanceSummary.Memory).To(MatchRegexp(`\d+(\.\d+)?[BKMG]? of \d+[BKMG]`)) }) }) @@ -295,8 +295,8 @@ var _ = Describe("scale command", func() { Expect(processSummary.Type).To(Equal("web")) Expect(processSummary.InstanceCount).To(MatchRegexp(`\d/2`)) Expect(instanceSummary.State).To(MatchRegexp(`running|starting`)) - Expect(instanceSummary.Memory).To(MatchRegexp(`\d+(\.\d+)?[KMG]? of 60M`)) - Expect(instanceSummary.Disk).To(MatchRegexp(`\d+(\.\d+)?[KMG]? of 512M`)) + Expect(instanceSummary.Memory).To(MatchRegexp(`\d+(\.\d+)?[BKMG]? of 60M`)) + Expect(instanceSummary.Disk).To(MatchRegexp(`\d+(\.\d+)?[BKMG]? of 512M`)) }) }) @@ -328,8 +328,8 @@ var _ = Describe("scale command", func() { Expect(processSummary.Type).To(Equal("web")) Expect(processSummary.InstanceCount).To(MatchRegexp(`\d/2`)) Expect(instanceSummary.State).To(MatchRegexp(`crashed`)) - Expect(instanceSummary.Memory).To(MatchRegexp(`\d+(\.\d+)?[KMG]? of 6M`)) - Expect(instanceSummary.Disk).To(MatchRegexp(`\d+(\.\d+)?[KMG]? of 10M`)) + Expect(instanceSummary.Memory).To(MatchRegexp(`\d+(\.\d+)?[BKMG]? of 6M`)) + Expect(instanceSummary.Disk).To(MatchRegexp(`\d+(\.\d+)?[BKMG]? of 10M`)) }) }) }) @@ -369,8 +369,8 @@ var _ = Describe("scale command", func() { newInstanceSummary := newProcessSummary.Instances[0] Expect(newProcessSummary.Type).To(Equal("web")) Expect(newProcessSummary.InstanceCount).To(MatchRegexp(fmt.Sprintf(`\d/%s`, currentInstances))) - Expect(newInstanceSummary.Memory).To(MatchRegexp(fmt.Sprintf(`\d+(\.\d+)?[KMG]? of %s`, maxMemory))) - Expect(newInstanceSummary.Disk).To(MatchRegexp(fmt.Sprintf(`\d+(\.\d+)?[KMG]? of %s`, maxDiskSize))) + Expect(newInstanceSummary.Memory).To(MatchRegexp(fmt.Sprintf(`\d+(\.\d+)?[BKMG]? of %s`, maxMemory))) + Expect(newInstanceSummary.Disk).To(MatchRegexp(fmt.Sprintf(`\d+(\.\d+)?[BKMG]? of %s`, maxDiskSize))) }) }) diff --git a/integration/v7/isolated/security_groups_command_test.go b/integration/v7/isolated/security_groups_command_test.go index e92e78c24b7..8581aa8f1db 100644 --- a/integration/v7/isolated/security_groups_command_test.go +++ b/integration/v7/isolated/security_groups_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/service_access_command_test.go b/integration/v7/isolated/service_access_command_test.go index b69614a9b05..3cd24fc51a4 100644 --- a/integration/v7/isolated/service_access_command_test.go +++ b/integration/v7/isolated/service_access_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/service_brokers_command_test.go b/integration/v7/isolated/service_brokers_command_test.go index 84e050170ea..b27126d02f9 100644 --- a/integration/v7/isolated/service_brokers_command_test.go +++ b/integration/v7/isolated/service_brokers_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/service_command_test.go b/integration/v7/isolated/service_command_test.go index 29a1efacc51..a89e7f5a0f5 100644 --- a/integration/v7/isolated/service_command_test.go +++ b/integration/v7/isolated/service_command_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/service_key_command_test.go b/integration/v7/isolated/service_key_command_test.go index eafb58f7e98..71487602674 100644 --- a/integration/v7/isolated/service_key_command_test.go +++ b/integration/v7/isolated/service_key_command_test.go @@ -6,8 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" "code.cloudfoundry.org/cli/integration/helpers" - - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/services_command_test.go b/integration/v7/isolated/services_command_test.go index 7d5bb504713..1c19de89ed1 100644 --- a/integration/v7/isolated/services_command_test.go +++ b/integration/v7/isolated/services_command_test.go @@ -5,7 +5,7 @@ import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_droplet_command_test.go b/integration/v7/isolated/set_droplet_command_test.go index b75a4349df9..a5db7cbdf74 100644 --- a/integration/v7/isolated/set_droplet_command_test.go +++ b/integration/v7/isolated/set_droplet_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_env_command_test.go b/integration/v7/isolated/set_env_command_test.go index 2f2c29d1fca..1e3a71fa642 100644 --- a/integration/v7/isolated/set_env_command_test.go +++ b/integration/v7/isolated/set_env_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_health_check_command_test.go b/integration/v7/isolated/set_health_check_command_test.go index a03fcf675aa..5d9d48b054a 100644 --- a/integration/v7/isolated/set_health_check_command_test.go +++ b/integration/v7/isolated/set_health_check_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_label_command_test.go b/integration/v7/isolated/set_label_command_test.go index 9fa2b22a21f..bfa24094794 100644 --- a/integration/v7/isolated/set_label_command_test.go +++ b/integration/v7/isolated/set_label_command_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_org_default_isolation_segment_command_test.go b/integration/v7/isolated/set_org_default_isolation_segment_command_test.go index f15ef040468..3c00315471d 100644 --- a/integration/v7/isolated/set_org_default_isolation_segment_command_test.go +++ b/integration/v7/isolated/set_org_default_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_org_quota_command_test.go b/integration/v7/isolated/set_org_quota_command_test.go index fd1fd1bcc66..0288818c69b 100644 --- a/integration/v7/isolated/set_org_quota_command_test.go +++ b/integration/v7/isolated/set_org_quota_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_org_role_command_test.go b/integration/v7/isolated/set_org_role_command_test.go index 4428cf074f8..60967ccef8e 100644 --- a/integration/v7/isolated/set_org_role_command_test.go +++ b/integration/v7/isolated/set_org_role_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_space_isolation_segment_command_test.go b/integration/v7/isolated/set_space_isolation_segment_command_test.go index 44050980843..64915b1890a 100644 --- a/integration/v7/isolated/set_space_isolation_segment_command_test.go +++ b/integration/v7/isolated/set_space_isolation_segment_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_space_quota_command_test.go b/integration/v7/isolated/set_space_quota_command_test.go index d92344b6cd5..19f2f451c66 100644 --- a/integration/v7/isolated/set_space_quota_command_test.go +++ b/integration/v7/isolated/set_space_quota_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/set_space_role_command_test.go b/integration/v7/isolated/set_space_role_command_test.go index a7224d8952d..f488745720e 100644 --- a/integration/v7/isolated/set_space_role_command_test.go +++ b/integration/v7/isolated/set_space_role_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/share_private_domain_test.go b/integration/v7/isolated/share_private_domain_test.go index c4be911f8e3..e9e62700353 100644 --- a/integration/v7/isolated/share_private_domain_test.go +++ b/integration/v7/isolated/share_private_domain_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/space_command_test.go b/integration/v7/isolated/space_command_test.go index 60334800966..86a786222e0 100644 --- a/integration/v7/isolated/space_command_test.go +++ b/integration/v7/isolated/space_command_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/space_quota_command_test.go b/integration/v7/isolated/space_quota_command_test.go index 34798df7ef7..db38d337086 100644 --- a/integration/v7/isolated/space_quota_command_test.go +++ b/integration/v7/isolated/space_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/space_quotas_command_test.go b/integration/v7/isolated/space_quotas_command_test.go index 880a561560b..5729bf34cbb 100644 --- a/integration/v7/isolated/space_quotas_command_test.go +++ b/integration/v7/isolated/space_quotas_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/space_ssh_allowed_command_test.go b/integration/v7/isolated/space_ssh_allowed_command_test.go index b6203ef9610..f2bdc27eb8b 100644 --- a/integration/v7/isolated/space_ssh_allowed_command_test.go +++ b/integration/v7/isolated/space_ssh_allowed_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/space_users_command_test.go b/integration/v7/isolated/space_users_command_test.go index c81293d4428..1cbb0e41026 100644 --- a/integration/v7/isolated/space_users_command_test.go +++ b/integration/v7/isolated/space_users_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "regexp" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/spaces_command_test.go b/integration/v7/isolated/spaces_command_test.go index 0357a5e9ea1..5ae047e821c 100644 --- a/integration/v7/isolated/spaces_command_test.go +++ b/integration/v7/isolated/spaces_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/ssh_code_command_test.go b/integration/v7/isolated/ssh_code_command_test.go index 54316f2e638..2866e47d449 100644 --- a/integration/v7/isolated/ssh_code_command_test.go +++ b/integration/v7/isolated/ssh_code_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/ssh_command_test.go b/integration/v7/isolated/ssh_command_test.go index 69229a4adf9..e7eeefd58a8 100644 --- a/integration/v7/isolated/ssh_command_test.go +++ b/integration/v7/isolated/ssh_command_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" @@ -283,7 +283,7 @@ var _ = Describe("ssh command", func() { var port int BeforeEach(func() { - port = 55500 + GinkgoParallelNode() + port = 55500 + GinkgoParallelProcess() }) It("configures local port to connect to the app port", func() { diff --git a/integration/v7/isolated/ssh_enabled_command_test.go b/integration/v7/isolated/ssh_enabled_command_test.go index f5f13781c82..0c920497b87 100644 --- a/integration/v7/isolated/ssh_enabled_command_test.go +++ b/integration/v7/isolated/ssh_enabled_command_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/stack_command_test.go b/integration/v7/isolated/stack_command_test.go index 73e138e34d2..dde2aadfa4e 100644 --- a/integration/v7/isolated/stack_command_test.go +++ b/integration/v7/isolated/stack_command_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/stacks_command_test.go b/integration/v7/isolated/stacks_command_test.go index 8911396ddcf..3403d3cda63 100644 --- a/integration/v7/isolated/stacks_command_test.go +++ b/integration/v7/isolated/stacks_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/stage_package_command_test.go b/integration/v7/isolated/stage_package_command_test.go index 29091d49a22..51080f94746 100644 --- a/integration/v7/isolated/stage_package_command_test.go +++ b/integration/v7/isolated/stage_package_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/start_command_test.go b/integration/v7/isolated/start_command_test.go index 6a16d6171a7..55e06f82ecf 100644 --- a/integration/v7/isolated/start_command_test.go +++ b/integration/v7/isolated/start_command_test.go @@ -9,7 +9,7 @@ import ( "regexp" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/stop_command_test.go b/integration/v7/isolated/stop_command_test.go index 4ceb44b77d3..698d51a6e1b 100644 --- a/integration/v7/isolated/stop_command_test.go +++ b/integration/v7/isolated/stop_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/suggest_command_test.go b/integration/v7/isolated/suggest_command_test.go index d602c2b30a6..d7c3bac87ee 100644 --- a/integration/v7/isolated/suggest_command_test.go +++ b/integration/v7/isolated/suggest_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "os/exec" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/table_alignment_test.go b/integration/v7/isolated/table_alignment_test.go index 46e3cfc7cff..0bd51ca4cd1 100644 --- a/integration/v7/isolated/table_alignment_test.go +++ b/integration/v7/isolated/table_alignment_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/target_command_test.go b/integration/v7/isolated/target_command_test.go index 6741b7e59a0..24ce9aa0085 100644 --- a/integration/v7/isolated/target_command_test.go +++ b/integration/v7/isolated/target_command_test.go @@ -4,8 +4,8 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/tasks_command_test.go b/integration/v7/isolated/tasks_command_test.go index 4c19fa0d484..8d1bb2d23da 100644 --- a/integration/v7/isolated/tasks_command_test.go +++ b/integration/v7/isolated/tasks_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/terminate_task_command_test.go b/integration/v7/isolated/terminate_task_command_test.go index 93d5937739c..8214016dc13 100644 --- a/integration/v7/isolated/terminate_task_command_test.go +++ b/integration/v7/isolated/terminate_task_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/token_refresh_test.go b/integration/v7/isolated/token_refresh_test.go index 0eec8352a38..17bdbf10e6e 100644 --- a/integration/v7/isolated/token_refresh_test.go +++ b/integration/v7/isolated/token_refresh_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unbind_route_service_command_test.go b/integration/v7/isolated/unbind_route_service_command_test.go index dc910dfc14f..3e9d45bb2fe 100644 --- a/integration/v7/isolated/unbind_route_service_command_test.go +++ b/integration/v7/isolated/unbind_route_service_command_test.go @@ -4,7 +4,7 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unbind_service_command_test.go b/integration/v7/isolated/unbind_service_command_test.go index 161ab2a698d..00e8e66fe9f 100644 --- a/integration/v7/isolated/unbind_service_command_test.go +++ b/integration/v7/isolated/unbind_service_command_test.go @@ -3,10 +3,9 @@ package isolated import ( "time" - "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unmap_route_command_test.go b/integration/v7/isolated/unmap_route_command_test.go index c8e0778ef9c..13bd47c4b7e 100644 --- a/integration/v7/isolated/unmap_route_command_test.go +++ b/integration/v7/isolated/unmap_route_command_test.go @@ -5,7 +5,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unset_env_command_test.go b/integration/v7/isolated/unset_env_command_test.go index 866181eb176..b1f1a2ea4a1 100644 --- a/integration/v7/isolated/unset_env_command_test.go +++ b/integration/v7/isolated/unset_env_command_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unset_label_command_test.go b/integration/v7/isolated/unset_label_command_test.go index 99f282f3c69..17ba799b2b4 100644 --- a/integration/v7/isolated/unset_label_command_test.go +++ b/integration/v7/isolated/unset_label_command_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unset_org_role_command_test.go b/integration/v7/isolated/unset_org_role_command_test.go index 3cc336c15ad..c8710d15e57 100644 --- a/integration/v7/isolated/unset_org_role_command_test.go +++ b/integration/v7/isolated/unset_org_role_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unset_space_quota_command_test.go b/integration/v7/isolated/unset_space_quota_command_test.go index c3183e69fdb..54eea9df6d4 100644 --- a/integration/v7/isolated/unset_space_quota_command_test.go +++ b/integration/v7/isolated/unset_space_quota_command_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unset_space_role_command_test.go b/integration/v7/isolated/unset_space_role_command_test.go index d68a4b65cc2..1b26ff90467 100644 --- a/integration/v7/isolated/unset_space_role_command_test.go +++ b/integration/v7/isolated/unset_space_role_command_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/unshare_private_domain_test.go b/integration/v7/isolated/unshare_private_domain_test.go index 2287b5e8cb0..aa30eea5552 100644 --- a/integration/v7/isolated/unshare_private_domain_test.go +++ b/integration/v7/isolated/unshare_private_domain_test.go @@ -3,7 +3,7 @@ package isolated import ( . "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/update_org_quota_command_test.go b/integration/v7/isolated/update_org_quota_command_test.go index e38efddd291..eaf408b4a57 100644 --- a/integration/v7/isolated/update_org_quota_command_test.go +++ b/integration/v7/isolated/update_org_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/update_service_broker_command_test.go b/integration/v7/isolated/update_service_broker_command_test.go index 46933da5992..0dbbdfa2adf 100644 --- a/integration/v7/isolated/update_service_broker_command_test.go +++ b/integration/v7/isolated/update_service_broker_command_test.go @@ -3,7 +3,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/update_service_command_test.go b/integration/v7/isolated/update_service_command_test.go index a28c14b295d..a48d0241c26 100644 --- a/integration/v7/isolated/update_service_command_test.go +++ b/integration/v7/isolated/update_service_command_test.go @@ -5,7 +5,8 @@ import ( "code.cloudfoundry.org/cli/integration/assets/hydrabroker/config" "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/integration/helpers/servicebrokerstub" - . "github.com/onsi/ginkgo" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/update_space_quota_command_test.go b/integration/v7/isolated/update_space_quota_command_test.go index 5d70363ba18..48d5d07ee29 100644 --- a/integration/v7/isolated/update_space_quota_command_test.go +++ b/integration/v7/isolated/update_space_quota_command_test.go @@ -2,7 +2,7 @@ package isolated import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/update_user_provided_service_command_test.go b/integration/v7/isolated/update_user_provided_service_command_test.go index 271b1d34665..3622b18269c 100644 --- a/integration/v7/isolated/update_user_provided_service_command_test.go +++ b/integration/v7/isolated/update_user_provided_service_command_test.go @@ -4,7 +4,7 @@ import ( "os" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/isolated/verbose_flag_test.go b/integration/v7/isolated/verbose_flag_test.go index 882291833d1..b76b9c6cfe0 100644 --- a/integration/v7/isolated/verbose_flag_test.go +++ b/integration/v7/isolated/verbose_flag_test.go @@ -9,8 +9,8 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/app_start_timeout_flag_test.go b/integration/v7/push/app_start_timeout_flag_test.go index a8c703dc2bd..32e1f109405 100644 --- a/integration/v7/push/app_start_timeout_flag_test.go +++ b/integration/v7/push/app_start_timeout_flag_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v7/push/buildpacks_test.go b/integration/v7/push/buildpacks_test.go index 9420272d70d..3a9ab46d746 100644 --- a/integration/v7/push/buildpacks_test.go +++ b/integration/v7/push/buildpacks_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/cfignore_test.go b/integration/v7/push/cfignore_test.go index 45c735fdcff..8b31ddef3a9 100644 --- a/integration/v7/push/cfignore_test.go +++ b/integration/v7/push/cfignore_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v7/push/combination_manifest_and_flag_test.go b/integration/v7/push/combination_manifest_and_flag_test.go index 315767dd266..d7f69b564b1 100644 --- a/integration/v7/push/combination_manifest_and_flag_test.go +++ b/integration/v7/push/combination_manifest_and_flag_test.go @@ -7,8 +7,8 @@ import ( "regexp" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/disk_flag_test.go b/integration/v7/push/disk_flag_test.go index 2729bd1d29b..c53fb699453 100644 --- a/integration/v7/push/disk_flag_test.go +++ b/integration/v7/push/disk_flag_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/docker_test.go b/integration/v7/push/docker_test.go index a6ad720d08b..3c4e99c350e 100644 --- a/integration/v7/push/docker_test.go +++ b/integration/v7/push/docker_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/droplet_flag_test.go b/integration/v7/push/droplet_flag_test.go index 66d3e24b25f..3294f22be34 100644 --- a/integration/v7/push/droplet_flag_test.go +++ b/integration/v7/push/droplet_flag_test.go @@ -6,7 +6,7 @@ import ( "os" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/health_check_test.go b/integration/v7/push/health_check_test.go index 1f0f764515a..0e60a5ebe6e 100644 --- a/integration/v7/push/health_check_test.go +++ b/integration/v7/push/health_check_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/help_test.go b/integration/v7/push/help_test.go index 526c611d0fc..997b048908a 100644 --- a/integration/v7/push/help_test.go +++ b/integration/v7/push/help_test.go @@ -5,7 +5,7 @@ import ( "strings" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/ignore_app_files_test.go b/integration/v7/push/ignore_app_files_test.go index 8bc27d10586..e78f869643e 100644 --- a/integration/v7/push/ignore_app_files_test.go +++ b/integration/v7/push/ignore_app_files_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/input_errors_test.go b/integration/v7/push/input_errors_test.go index 413ab6e40be..3384ad5b230 100644 --- a/integration/v7/push/input_errors_test.go +++ b/integration/v7/push/input_errors_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/instances_flag_test.go b/integration/v7/push/instances_flag_test.go index ec5ed668bc3..d4387b2b328 100644 --- a/integration/v7/push/instances_flag_test.go +++ b/integration/v7/push/instances_flag_test.go @@ -4,7 +4,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/manifest_location_test.go b/integration/v7/push/manifest_location_test.go index 0761441a704..2564e031d6a 100644 --- a/integration/v7/push/manifest_location_test.go +++ b/integration/v7/push/manifest_location_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/manifest_with_app_name_and_no_route_flag_test.go b/integration/v7/push/manifest_with_app_name_and_no_route_flag_test.go index c490c6e2225..2494eddc7c1 100644 --- a/integration/v7/push/manifest_with_app_name_and_no_route_flag_test.go +++ b/integration/v7/push/manifest_with_app_name_and_no_route_flag_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/manifest_with_app_name_test.go b/integration/v7/push/manifest_with_app_name_test.go index 3d004dae3f3..c2ddc987ed4 100644 --- a/integration/v7/push/manifest_with_app_name_test.go +++ b/integration/v7/push/manifest_with_app_name_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/memory_flag_test.go b/integration/v7/push/memory_flag_test.go index 28e81bf476b..0b577371f7f 100644 --- a/integration/v7/push/memory_flag_test.go +++ b/integration/v7/push/memory_flag_test.go @@ -4,7 +4,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/name_only_test.go b/integration/v7/push/name_only_test.go index 2d80d195d0c..28fbe161965 100644 --- a/integration/v7/push/name_only_test.go +++ b/integration/v7/push/name_only_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/no_route_test.go b/integration/v7/push/no_route_test.go index 3fdea25f1ff..a776ee0eb50 100644 --- a/integration/v7/push/no_route_test.go +++ b/integration/v7/push/no_route_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/no_start_test.go b/integration/v7/push/no_start_test.go index 2708692551e..e95975427cc 100644 --- a/integration/v7/push/no_start_test.go +++ b/integration/v7/push/no_start_test.go @@ -3,7 +3,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/no_wait_test.go b/integration/v7/push/no_wait_test.go index ca7798dda55..b17fd4fd01b 100644 --- a/integration/v7/push/no_wait_test.go +++ b/integration/v7/push/no_wait_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/path_test.go b/integration/v7/push/path_test.go index f1b0914afec..11c29ab6c63 100644 --- a/integration/v7/push/path_test.go +++ b/integration/v7/push/path_test.go @@ -9,7 +9,7 @@ import ( "runtime" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/push_output_test.go b/integration/v7/push/push_output_test.go index a47373158ea..03224742ce9 100644 --- a/integration/v7/push/push_output_test.go +++ b/integration/v7/push/push_output_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/push_suite_test.go b/integration/v7/push/push_suite_test.go index edf730363bc..cbf86bd7887 100644 --- a/integration/v7/push/push_suite_test.go +++ b/integration/v7/push/push_suite_test.go @@ -8,7 +8,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -48,7 +48,7 @@ var _ = SynchronizedBeforeSuite(func() []byte { return nil }, func(_ []byte) { - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) // Ginkgo Globals SetDefaultEventuallyTimeout(CFEventuallyTimeout) SetDefaultConsistentlyDuration(CFConsistentlyTimeout) @@ -69,18 +69,18 @@ var _ = SynchronizedBeforeSuite(func() []byte { var err error realDir, err = ioutil.TempDir("", "push-real-dir") Expect(err).ToNot(HaveOccurred()) - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess()))) }) var _ = SynchronizedAfterSuite(func() { - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelProcess()))) homeDir = helpers.SetHomeDir() helpers.SetAPI() helpers.LoginCF() helpers.QuickDeleteOrg(organization) Expect(os.RemoveAll(realDir)).ToNot(HaveOccurred()) helpers.DestroyHomeDir(homeDir) - GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelNode()))) + GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelProcess()))) }, func() { }) diff --git a/integration/v7/push/random_route_test.go b/integration/v7/push/random_route_test.go index 2dc130ac882..f50d7e4c2a4 100644 --- a/integration/v7/push/random_route_test.go +++ b/integration/v7/push/random_route_test.go @@ -6,7 +6,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/resource_matching_test.go b/integration/v7/push/resource_matching_test.go index 2af37efb83c..078f1787260 100644 --- a/integration/v7/push/resource_matching_test.go +++ b/integration/v7/push/resource_matching_test.go @@ -8,7 +8,7 @@ import ( "time" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/rolling_push_test.go b/integration/v7/push/rolling_push_test.go index 1b4739e507c..689faf5244f 100644 --- a/integration/v7/push/rolling_push_test.go +++ b/integration/v7/push/rolling_push_test.go @@ -4,7 +4,7 @@ import ( "fmt" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/simple_manifest_only_test.go b/integration/v7/push/simple_manifest_only_test.go index 2b8e2017c79..212871eeec5 100644 --- a/integration/v7/push/simple_manifest_only_test.go +++ b/integration/v7/push/simple_manifest_only_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/stacks_test.go b/integration/v7/push/stacks_test.go index ea384ed31a9..9fc5a0e378b 100644 --- a/integration/v7/push/stacks_test.go +++ b/integration/v7/push/stacks_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/start_command_test.go b/integration/v7/push/start_command_test.go index 893fbf0fe1b..efe675f513f 100644 --- a/integration/v7/push/start_command_test.go +++ b/integration/v7/push/start_command_test.go @@ -5,8 +5,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/integration/v7/push/symlink_resources_test.go b/integration/v7/push/symlink_resources_test.go index ee2918c3dc7..e2413af8a59 100644 --- a/integration/v7/push/symlink_resources_test.go +++ b/integration/v7/push/symlink_resources_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v7/push/symlink_test.go b/integration/v7/push/symlink_test.go index 93bc7f842b2..1e838520420 100644 --- a/integration/v7/push/symlink_test.go +++ b/integration/v7/push/symlink_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) diff --git a/integration/v7/push/targeting_test.go b/integration/v7/push/targeting_test.go index eb532fcbd88..e109f058eb8 100644 --- a/integration/v7/push/targeting_test.go +++ b/integration/v7/push/targeting_test.go @@ -2,7 +2,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" ) var _ = Describe("targeting the correct environment", func() { diff --git a/integration/v7/push/tasks_test.go b/integration/v7/push/tasks_test.go index 63f2f566095..4b85976ea2a 100644 --- a/integration/v7/push/tasks_test.go +++ b/integration/v7/push/tasks_test.go @@ -3,7 +3,7 @@ package push import ( "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" "github.com/onsi/gomega/gexec" diff --git a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_suite_test.go b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_suite_test.go index ec3e95fbb87..a31acf07fac 100644 --- a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_suite_test.go +++ b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_suite_test.go @@ -4,7 +4,7 @@ import ( "time" "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_test.go b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_test.go index 5e506e0514f..26bf1c7ed4c 100644 --- a/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_test.go +++ b/plugin/plugin_examples/test_rpc_server_example/test_rpc_server_example_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver" "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver/rpcserverfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" "github.com/onsi/gomega/gexec" diff --git a/plugin/plugin_shim_test.go b/plugin/plugin_shim_test.go index c7495d62d7a..24b49226655 100644 --- a/plugin/plugin_shim_test.go +++ b/plugin/plugin_shim_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver" "code.cloudfoundry.org/cli/cf/util/testhelpers/rpcserver/rpcserverfakes" "code.cloudfoundry.org/cli/plugin" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" diff --git a/plugin/plugin_suite_test.go b/plugin/plugin_suite_test.go index e05394e937a..4b02e049580 100644 --- a/plugin/plugin_suite_test.go +++ b/plugin/plugin_suite_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/cf/util/testhelpers/pluginbuilder" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/plugin/rpc/call_command_registry_test.go b/plugin/rpc/call_command_registry_test.go index 1cc3b48149d..6d21be85aa9 100644 --- a/plugin/rpc/call_command_registry_test.go +++ b/plugin/rpc/call_command_registry_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/cf/trace/tracefakes" . "code.cloudfoundry.org/cli/plugin/rpc" . "code.cloudfoundry.org/cli/plugin/rpc/fakecommand" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugin/rpc/cli_rpc_server_test.go b/plugin/rpc/cli_rpc_server_test.go index 9c863767f4d..5f55b1594d3 100644 --- a/plugin/rpc/cli_rpc_server_test.go +++ b/plugin/rpc/cli_rpc_server_test.go @@ -19,7 +19,7 @@ import ( cmdRunner "code.cloudfoundry.org/cli/plugin/rpc" . "code.cloudfoundry.org/cli/plugin/rpc/fakecommand" "code.cloudfoundry.org/cli/plugin/rpc/rpcfakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/plugin/rpc/rpc_suite_test.go b/plugin/rpc/rpc_suite_test.go index 3d55040f792..e67a82a6263 100644 --- a/plugin/rpc/rpc_suite_test.go +++ b/plugin/rpc/rpc_suite_test.go @@ -2,7 +2,7 @@ package rpc_test import ( "code.cloudfoundry.org/cli/plugin/rpc" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/resources/process_resource_test.go b/resources/process_resource_test.go index 394e8f1a61e..2baed2ad7ad 100644 --- a/resources/process_resource_test.go +++ b/resources/process_resource_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3/constant" "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/resources/quota_resource_test.go b/resources/quota_resource_test.go index fb5e96ed80b..503130bbd6d 100644 --- a/resources/quota_resource_test.go +++ b/resources/quota_resource_test.go @@ -4,8 +4,7 @@ import ( "encoding/json" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/resources_suite_test.go b/resources/resources_suite_test.go index 3b4f1a6335a..dd8d7c3e7dd 100644 --- a/resources/resources_suite_test.go +++ b/resources/resources_suite_test.go @@ -3,7 +3,7 @@ package resources_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/security_group_resource_test.go b/resources/security_group_resource_test.go index 5370d473923..b4e5e284f0c 100644 --- a/resources/security_group_resource_test.go +++ b/resources/security_group_resource_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" . "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_broker_resource_test.go b/resources/service_broker_resource_test.go index c89ffda1426..024346b08d3 100644 --- a/resources/service_broker_resource_test.go +++ b/resources/service_broker_resource_test.go @@ -5,8 +5,7 @@ import ( . "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_instance_resource_test.go b/resources/service_instance_resource_test.go index 6315490643e..78c1480ea6e 100644 --- a/resources/service_instance_resource_test.go +++ b/resources/service_instance_resource_test.go @@ -4,8 +4,7 @@ import ( "encoding/json" . "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_offering_resource_test.go b/resources/service_offering_resource_test.go index 4a762d0cb7e..c999a4a1664 100644 --- a/resources/service_offering_resource_test.go +++ b/resources/service_offering_resource_test.go @@ -5,8 +5,7 @@ import ( . "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_plan_resource_test.go b/resources/service_plan_resource_test.go index 0b3947120e8..8e51b8e05a6 100644 --- a/resources/service_plan_resource_test.go +++ b/resources/service_plan_resource_test.go @@ -5,8 +5,7 @@ import ( . "code.cloudfoundry.org/cli/resources" "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/resources/service_plan_visibility_resource_test.go b/resources/service_plan_visibility_resource_test.go index 51c08820751..7661b0f9a3a 100644 --- a/resources/service_plan_visibility_resource_test.go +++ b/resources/service_plan_visibility_resource_test.go @@ -4,8 +4,7 @@ import ( "encoding/json" . "code.cloudfoundry.org/cli/resources" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/filtered_interface_test.go b/types/filtered_interface_test.go index bf10aaf8515..09da42ec708 100644 --- a/types/filtered_interface_test.go +++ b/types/filtered_interface_test.go @@ -2,7 +2,7 @@ package types_test import ( . "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/filtered_string_test.go b/types/filtered_string_test.go index bad9d09fa9c..bb0dd23090f 100644 --- a/types/filtered_string_test.go +++ b/types/filtered_string_test.go @@ -2,8 +2,8 @@ package types_test import ( . "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_bool_test.go b/types/null_bool_test.go index 03e63ff77bf..9e73bcbc917 100644 --- a/types/null_bool_test.go +++ b/types/null_bool_test.go @@ -2,8 +2,7 @@ package types_test import ( . "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_bytesize_in_mb_test.go b/types/null_bytesize_in_mb_test.go index 1bb4c20f205..f713e3d270a 100644 --- a/types/null_bytesize_in_mb_test.go +++ b/types/null_bytesize_in_mb_test.go @@ -2,7 +2,7 @@ package types_test import ( . "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_int_test.go b/types/null_int_test.go index c24bda0f666..455a9eec1d6 100644 --- a/types/null_int_test.go +++ b/types/null_int_test.go @@ -3,8 +3,8 @@ package types_test import ( . "code.cloudfoundry.org/cli/types" "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_string_test.go b/types/null_string_test.go index 816397cce32..ddeca89c2be 100644 --- a/types/null_string_test.go +++ b/types/null_string_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" . "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/null_uint64_test.go b/types/null_uint64_test.go index 329d282200a..884a69d3113 100644 --- a/types/null_uint64_test.go +++ b/types/null_uint64_test.go @@ -2,7 +2,7 @@ package types_test import ( . "code.cloudfoundry.org/cli/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/types/types_suite_test.go b/types/types_suite_test.go index b026169c12b..5cd5acbcb2a 100644 --- a/types/types_suite_test.go +++ b/types/types_suite_test.go @@ -1,7 +1,7 @@ package types_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/util/batcher/batcher_suite_test.go b/util/batcher/batcher_suite_test.go index 1f0a5c4e9fb..b3ac7ff6ac8 100644 --- a/util/batcher/batcher_suite_test.go +++ b/util/batcher/batcher_suite_test.go @@ -3,7 +3,7 @@ package batcher_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/batcher/batcher_test.go b/util/batcher/batcher_test.go index 28e635b3298..ccaca8687f6 100644 --- a/util/batcher/batcher_test.go +++ b/util/batcher/batcher_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/api/cloudcontroller/ccv3" "code.cloudfoundry.org/cli/util/batcher" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/checksum_test.go b/util/checksum_test.go index bcd4b712820..d7dfe1cd299 100644 --- a/util/checksum_test.go +++ b/util/checksum_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/util" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/clissh/ssh_suite_test.go b/util/clissh/ssh_suite_test.go index 0adf40c9b9d..9d157c12c19 100644 --- a/util/clissh/ssh_suite_test.go +++ b/util/clissh/ssh_suite_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" diff --git a/util/clissh/ssh_test.go b/util/clissh/ssh_test.go index 4a75c7be39c..2074aa42860 100644 --- a/util/clissh/ssh_test.go +++ b/util/clissh/ssh_test.go @@ -26,10 +26,10 @@ import ( "code.cloudfoundry.org/diego-ssh/test_helpers/fake_io" "code.cloudfoundry.org/diego-ssh/test_helpers/fake_net" "code.cloudfoundry.org/diego-ssh/test_helpers/fake_ssh" - "code.cloudfoundry.org/lager/lagertest" - "github.com/kr/pty" + "code.cloudfoundry.org/lager/v3/lagertest" + "github.com/creack/pty" "github.com/moby/term" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "golang.org/x/crypto/ssh" ) @@ -50,7 +50,7 @@ func BlockAcceptOnClose(fake *fake_net.FakeListener) { } } -var _ = Describe("CLI SSH", func() { +var _ = Describe("CLI SSH", Serial, func() { var ( fakeSecureDialer *clisshfakes.FakeSecureDialer fakeSecureClient *clisshfakes.FakeSecureClient @@ -125,7 +125,7 @@ var _ = Describe("CLI SSH", func() { ) }) - Describe("Connect", func() { + Describe("Connect", Serial, func() { var connectErr error JustBeforeEach(func() { @@ -175,7 +175,7 @@ var _ = Describe("CLI SSH", func() { }) }) - Describe("InteractiveSession", func() { + Describe("InteractiveSession", Serial, func() { var ( stdin *fake_io.FakeReadCloser stdout, stderr *fake_io.FakeWriter @@ -820,7 +820,7 @@ var _ = Describe("CLI SSH", func() { }) }) - Describe("LocalPortForward", func() { + Describe("LocalPortForward", Serial, func() { var ( forwardErr error @@ -865,7 +865,7 @@ var _ = Describe("CLI SSH", func() { fakeLocalListener = new(fake_net.FakeListener) fakeLocalListener.AcceptReturns(nil, errors.New("Not Accepting Connections")) - echoServer = server.NewServer(logger.Session("echo"), "", echoHandler) + echoServer = server.NewServer(logger.Session("echo"), "", echoHandler, 500*time.Millisecond) err = echoServer.SetListener(echoListener) Expect(err).NotTo(HaveOccurred()) go echoServer.Serve() @@ -1149,7 +1149,7 @@ var _ = Describe("CLI SSH", func() { }) }) - Describe("Wait", func() { + Describe("Wait", Serial, func() { var waitErr error JustBeforeEach(func() { @@ -1203,7 +1203,7 @@ var _ = Describe("CLI SSH", func() { }) }) - Describe("Close", func() { + Describe("Close", Serial, func() { JustBeforeEach(func() { connectErr := secureShell.Connect(username, passcode, sshEndpoint, sshEndpointFingerprint, skipHostValidation) Expect(connectErr).NotTo(HaveOccurred()) diff --git a/util/command_parser/command_parser_test.go b/util/command_parser/command_parser_test.go index 7f65c1f63d6..367e7f3b3fb 100644 --- a/util/command_parser/command_parser_test.go +++ b/util/command_parser/command_parser_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/util/command_parser" "code.cloudfoundry.org/cli/util/configv3" "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/command_parser/parser_suite_test.go b/util/command_parser/parser_suite_test.go index 73090e428ea..1e796cb6cfb 100644 --- a/util/command_parser/parser_suite_test.go +++ b/util/command_parser/parser_suite_test.go @@ -1,7 +1,7 @@ package command_parser_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/util/configv3/color_test.go b/util/configv3/color_test.go index 249784077e2..d3ae227e00a 100644 --- a/util/configv3/color_test.go +++ b/util/configv3/color_test.go @@ -5,8 +5,7 @@ import ( "os" . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config_suite_test.go b/util/configv3/config_suite_test.go index 07630b8b33d..95c6c00c320 100644 --- a/util/configv3/config_suite_test.go +++ b/util/configv3/config_suite_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "code.cloudfoundry.org/cli/integration/helpers" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/util/configv3/config_test.go b/util/configv3/config_test.go index a646536f20a..8a13fd6baf6 100644 --- a/util/configv3/config_test.go +++ b/util/configv3/config_test.go @@ -4,8 +4,7 @@ import ( "os" . "code.cloudfoundry.org/cli/util/configv3" - - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config_unix_test.go b/util/configv3/config_unix_test.go index 6af4f29361b..21b972f9069 100644 --- a/util/configv3/config_unix_test.go +++ b/util/configv3/config_unix_test.go @@ -11,8 +11,7 @@ import ( . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/config_windows_test.go b/util/configv3/config_windows_test.go index fad8241b3ac..e478e4da39a 100644 --- a/util/configv3/config_windows_test.go +++ b/util/configv3/config_windows_test.go @@ -10,8 +10,7 @@ import ( . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/env_test.go b/util/configv3/env_test.go index aa77499d6f0..0f7a060f6cd 100644 --- a/util/configv3/env_test.go +++ b/util/configv3/env_test.go @@ -5,8 +5,7 @@ import ( . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/json_config_test.go b/util/configv3/json_config_test.go index 9662c878252..10f148c97ea 100644 --- a/util/configv3/json_config_test.go +++ b/util/configv3/json_config_test.go @@ -6,7 +6,7 @@ import ( . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/load_config_test.go b/util/configv3/load_config_test.go index cd98d810e2d..9fdb6a9286b 100644 --- a/util/configv3/load_config_test.go +++ b/util/configv3/load_config_test.go @@ -11,7 +11,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/locale_test.go b/util/configv3/locale_test.go index 6049d87c235..53d2c3b77c8 100644 --- a/util/configv3/locale_test.go +++ b/util/configv3/locale_test.go @@ -6,8 +6,7 @@ import ( . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/plugin_repository_test.go b/util/configv3/plugin_repository_test.go index 6a8b9dc5c95..4ed60b41e41 100644 --- a/util/configv3/plugin_repository_test.go +++ b/util/configv3/plugin_repository_test.go @@ -3,7 +3,7 @@ package configv3_test import ( . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/plugins_config_test.go b/util/configv3/plugins_config_test.go index d537db68fbf..3639f80e733 100644 --- a/util/configv3/plugins_config_test.go +++ b/util/configv3/plugins_config_test.go @@ -7,8 +7,8 @@ import ( "syscall" . "code.cloudfoundry.org/cli/util/configv3" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/configv3/write_config_test.go b/util/configv3/write_config_test.go index 2e1bf574a6f..aeb9778c411 100644 --- a/util/configv3/write_config_test.go +++ b/util/configv3/write_config_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" "gopkg.in/yaml.v2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/download/download_suite_test.go b/util/download/download_suite_test.go index 329010ea23a..ea48ecc88b1 100644 --- a/util/download/download_suite_test.go +++ b/util/download/download_suite_test.go @@ -3,7 +3,7 @@ package download_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/download/downloader_test.go b/util/download/downloader_test.go index cc5b4f56581..ea285c9358f 100644 --- a/util/download/downloader_test.go +++ b/util/download/downloader_test.go @@ -7,7 +7,7 @@ import ( "os" "strings" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "code.cloudfoundry.org/cli/util/download" diff --git a/util/generic/architecture_test.go b/util/generic/architecture_test.go index 89cd081dcdd..1dc8775d3dd 100644 --- a/util/generic/architecture_test.go +++ b/util/generic/architecture_test.go @@ -2,8 +2,7 @@ package generic_test import ( . "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/executable_filename_unix_test.go b/util/generic/executable_filename_unix_test.go index 84f4e3fd7db..d6700b0456d 100644 --- a/util/generic/executable_filename_unix_test.go +++ b/util/generic/executable_filename_unix_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" . "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/executable_filename_windows_test.go b/util/generic/executable_filename_windows_test.go index bbcb8a33577..95fd6a4b8d2 100644 --- a/util/generic/executable_filename_windows_test.go +++ b/util/generic/executable_filename_windows_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" . "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/generic_suite_test.go b/util/generic/generic_suite_test.go index da96edae237..0352c6f9584 100644 --- a/util/generic/generic_suite_test.go +++ b/util/generic/generic_suite_test.go @@ -1,7 +1,7 @@ package generic_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/util/generic/map_test.go b/util/generic/map_test.go index c3471fe81cb..9b51c82a3d6 100644 --- a/util/generic/map_test.go +++ b/util/generic/map_test.go @@ -2,7 +2,7 @@ package generic_test import ( . "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/generic/slice_test.go b/util/generic/slice_test.go index e24def73d2e..48403e9b3ba 100644 --- a/util/generic/slice_test.go +++ b/util/generic/slice_test.go @@ -2,7 +2,7 @@ package generic_test import ( "code.cloudfoundry.org/cli/util/generic" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/manifest/manifest_suite_test.go b/util/manifest/manifest_suite_test.go index 2d894f1dec8..8cb408bd8ba 100644 --- a/util/manifest/manifest_suite_test.go +++ b/util/manifest/manifest_suite_test.go @@ -1,7 +1,7 @@ package manifest_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/util/manifest/manifest_test.go b/util/manifest/manifest_test.go index cb91fdbed03..3d3e3262594 100644 --- a/util/manifest/manifest_test.go +++ b/util/manifest/manifest_test.go @@ -11,8 +11,8 @@ import ( "code.cloudfoundry.org/cli/types" . "code.cloudfoundry.org/cli/util/manifest" "github.com/cloudfoundry/bosh-cli/director/template" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" ) diff --git a/util/manifest/manifest_unix_test.go b/util/manifest/manifest_unix_test.go index be5775ae881..dfb40924316 100644 --- a/util/manifest/manifest_unix_test.go +++ b/util/manifest/manifest_unix_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/manifest/manifest_windows_test.go b/util/manifest/manifest_windows_test.go index 719b4870543..14b2107762f 100644 --- a/util/manifest/manifest_windows_test.go +++ b/util/manifest/manifest_windows_test.go @@ -10,7 +10,7 @@ import ( . "code.cloudfoundry.org/cli/util/manifest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/manifestparser/application_test.go b/util/manifestparser/application_test.go index 70cbaddd86f..17eaaa9e286 100644 --- a/util/manifestparser/application_test.go +++ b/util/manifestparser/application_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/util/manifestparser" "gopkg.in/yaml.v2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/manifestparser/locator_test.go b/util/manifestparser/locator_test.go index 64483923a15..c64c1984013 100644 --- a/util/manifestparser/locator_test.go +++ b/util/manifestparser/locator_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/util/manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/manifestparser/manifest_test.go b/util/manifestparser/manifest_test.go index b4e11d6133a..0a8fcde3db9 100644 --- a/util/manifestparser/manifest_test.go +++ b/util/manifestparser/manifest_test.go @@ -2,7 +2,7 @@ package manifestparser_test import ( . "code.cloudfoundry.org/cli/util/manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" ) diff --git a/util/manifestparser/manifestparser_suite_test.go b/util/manifestparser/manifestparser_suite_test.go index a612b2f47ec..3034178ef52 100644 --- a/util/manifestparser/manifestparser_suite_test.go +++ b/util/manifestparser/manifestparser_suite_test.go @@ -3,7 +3,7 @@ package manifestparser_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/manifestparser/parser_test.go b/util/manifestparser/parser_test.go index 5be00a31ffb..2db4c07fac4 100644 --- a/util/manifestparser/parser_test.go +++ b/util/manifestparser/parser_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/util/manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/manifestparser/process_test.go b/util/manifestparser/process_test.go index 33753ba85bf..b41a4b11276 100644 --- a/util/manifestparser/process_test.go +++ b/util/manifestparser/process_test.go @@ -2,7 +2,7 @@ package manifestparser_test import ( . "code.cloudfoundry.org/cli/util/manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" ) diff --git a/util/randomword/generator_test.go b/util/randomword/generator_test.go index 1ba1bb58798..944d4abe51d 100644 --- a/util/randomword/generator_test.go +++ b/util/randomword/generator_test.go @@ -3,7 +3,7 @@ package randomword_test import ( . "code.cloudfoundry.org/cli/util/randomword" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/randomword/randomword_suite_test.go b/util/randomword/randomword_suite_test.go index e19bc398e9e..2f6ebd45a26 100644 --- a/util/randomword/randomword_suite_test.go +++ b/util/randomword/randomword_suite_test.go @@ -1,7 +1,7 @@ package randomword_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/util/sorting/alphabetic_test.go b/util/sorting/alphabetic_test.go index 807056a0308..14756731ac8 100644 --- a/util/sorting/alphabetic_test.go +++ b/util/sorting/alphabetic_test.go @@ -5,8 +5,7 @@ import ( . "code.cloudfoundry.org/cli/util/sorting" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/sorting/sorting_suite_test.go b/util/sorting/sorting_suite_test.go index ad6b83ae553..f11f3692b98 100644 --- a/util/sorting/sorting_suite_test.go +++ b/util/sorting/sorting_suite_test.go @@ -1,7 +1,7 @@ package sorting_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/util/tls_test.go b/util/tls_test.go index 96e6570d2c1..b176522447c 100644 --- a/util/tls_test.go +++ b/util/tls_test.go @@ -6,7 +6,7 @@ import ( "encoding/pem" . "code.cloudfoundry.org/cli/util" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/ui/i18n_test.go b/util/ui/i18n_test.go index 115997cb040..01f85f7d09b 100644 --- a/util/ui/i18n_test.go +++ b/util/ui/i18n_test.go @@ -4,8 +4,7 @@ import ( . "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/util/ui/uifakes" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/ui/log_message_test.go b/util/ui/log_message_test.go index b1314528494..66790b582c7 100644 --- a/util/ui/log_message_test.go +++ b/util/ui/log_message_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" . "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/util/ui/uifakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/util/ui/prompt_test.go b/util/ui/prompt_test.go index 475019ebbac..1234e003aa7 100644 --- a/util/ui/prompt_test.go +++ b/util/ui/prompt_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" . "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/util/ui/uifakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" "github.com/vito/go-interact/interact" diff --git a/util/ui/request_logger_file_writer_test.go b/util/ui/request_logger_file_writer_test.go index be9ab823cea..43d11b5530a 100644 --- a/util/ui/request_logger_file_writer_test.go +++ b/util/ui/request_logger_file_writer_test.go @@ -11,7 +11,7 @@ import ( . "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/util/ui/request_logger_terminal_display_test.go b/util/ui/request_logger_terminal_display_test.go index 054871a26c1..77b780954f3 100644 --- a/util/ui/request_logger_terminal_display_test.go +++ b/util/ui/request_logger_terminal_display_test.go @@ -7,7 +7,7 @@ import ( . "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/util/ui/sanitize_json_test.go b/util/ui/sanitize_json_test.go index a7df0c21d99..bf8a1085582 100644 --- a/util/ui/sanitize_json_test.go +++ b/util/ui/sanitize_json_test.go @@ -5,8 +5,7 @@ import ( . "code.cloudfoundry.org/cli/util/ui" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/ui/table_test.go b/util/ui/table_test.go index 3156f797d86..aeef5fe9578 100644 --- a/util/ui/table_test.go +++ b/util/ui/table_test.go @@ -6,7 +6,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" . "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/util/ui/uifakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/util/ui/ui_for_app_test.go b/util/ui/ui_for_app_test.go index f6805659a8d..7051f807698 100644 --- a/util/ui/ui_for_app_test.go +++ b/util/ui/ui_for_app_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" . "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/util/ui/uifakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/util/ui/ui_for_push_test.go b/util/ui/ui_for_push_test.go index 4fa4d0474db..92738b8b40e 100644 --- a/util/ui/ui_for_push_test.go +++ b/util/ui/ui_for_push_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" . "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/util/ui/uifakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/util/ui/ui_suite_test.go b/util/ui/ui_suite_test.go index 02ca8eaecfb..d10331eb82f 100644 --- a/util/ui/ui_suite_test.go +++ b/util/ui/ui_suite_test.go @@ -1,7 +1,7 @@ package ui_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/util/ui/ui_test.go b/util/ui/ui_test.go index 95ea47afac7..3d107a2ebb2 100644 --- a/util/ui/ui_test.go +++ b/util/ui/ui_test.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" . "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/util/ui/uifakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/util/ui/ui_v7_test.go b/util/ui/ui_v7_test.go index 4f716c8149b..f33445c1a60 100644 --- a/util/ui/ui_v7_test.go +++ b/util/ui/ui_v7_test.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/cli/util/configv3" . "code.cloudfoundry.org/cli/util/ui" "code.cloudfoundry.org/cli/util/ui/uifakes" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" ) diff --git a/util/url_test.go b/util/url_test.go index 238f63ad6d2..2a4cf89d2e8 100644 --- a/util/url_test.go +++ b/util/url_test.go @@ -2,8 +2,8 @@ package util_test import ( . "code.cloudfoundry.org/cli/util" - . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/extensions/table" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/util_suite_test.go b/util/util_suite_test.go index f712f1f5943..0bfd51422dd 100644 --- a/util/util_suite_test.go +++ b/util/util_suite_test.go @@ -1,7 +1,7 @@ package util_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/util/v6manifestparser/application_test.go b/util/v6manifestparser/application_test.go index 7f7ed84bad0..c07f3a9298f 100644 --- a/util/v6manifestparser/application_test.go +++ b/util/v6manifestparser/application_test.go @@ -4,7 +4,7 @@ import ( . "code.cloudfoundry.org/cli/util/v6manifestparser" "gopkg.in/yaml.v2" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/v6manifestparser/locator_test.go b/util/v6manifestparser/locator_test.go index 49a7598cd72..33511f348e5 100644 --- a/util/v6manifestparser/locator_test.go +++ b/util/v6manifestparser/locator_test.go @@ -8,7 +8,7 @@ import ( . "code.cloudfoundry.org/cli/util/v6manifestparser" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/v6manifestparser/manifestparser_suite_test.go b/util/v6manifestparser/manifestparser_suite_test.go index 3dd959bda45..cec1cc705a8 100644 --- a/util/v6manifestparser/manifestparser_suite_test.go +++ b/util/v6manifestparser/manifestparser_suite_test.go @@ -3,7 +3,7 @@ package v6manifestparser_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/v6manifestparser/parser_test.go b/util/v6manifestparser/parser_test.go index 322cb1c31ae..4a5ed20ac96 100644 --- a/util/v6manifestparser/parser_test.go +++ b/util/v6manifestparser/parser_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers" . "code.cloudfoundry.org/cli/util/v6manifestparser" "github.com/cloudfoundry/bosh-cli/director/template" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/v6manifestparser/validation_test.go b/util/v6manifestparser/validation_test.go index 3759d7b427b..d0aa6b8d06f 100644 --- a/util/v6manifestparser/validation_test.go +++ b/util/v6manifestparser/validation_test.go @@ -1,7 +1,7 @@ package v6manifestparser_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" ) var _ = Describe("Validate", func() { diff --git a/version/version_suite_test.go b/version/version_suite_test.go index 342abdc626d..43f16dd2f4c 100644 --- a/version/version_suite_test.go +++ b/version/version_suite_test.go @@ -1,7 +1,7 @@ package version_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "testing" diff --git a/version/version_test.go b/version/version_test.go index 587eca3330b..2d1c3337403 100644 --- a/version/version_test.go +++ b/version/version_test.go @@ -2,7 +2,7 @@ package version_test import ( "code.cloudfoundry.org/cli/version" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" )